diff --git a/common/content/hints.js b/common/content/hints.js
index 50c4533a..d349ce58 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -425,7 +425,7 @@ function Hints() //{{{
                         let beyondLastWord = (nextWordIdx == words.length);
                         let charMatched = false;
                         if (beyondLastWord == false)
-                            charMatched = charMatches(nextCharIdx, chars, nextWordIdx, words, 0, allowWordOverleaping) 
+                            charMatched = charMatches(nextCharIdx, chars, nextWordIdx, words, 0, allowWordOverleaping)
 
                         if (charMatched)
                             return true;
diff --git a/muttator/content/mail.js b/muttator/content/mail.js
index 61242230..1e523167 100644
--- a/muttator/content/mail.js
+++ b/muttator/content/mail.js
@@ -995,12 +995,13 @@ function Mail() //{{{
                     // TODO: find out why, and solve the problem
                     try
                     {
-                        var msgs = folder.getMessages(msgWindow);
+                        var msgs = folder.messages;
                     }
                     catch (e)
                     {
-                        liberator.dump("ERROR: " + folder.prettyName + " failed to getMessages\n");
-                        continue;
+                        var msgs = folder.getMessages(msgWindow); // for older thunderbirds
+                        liberator.dump("WARNING: " + folder.prettyName + " failed to getMessages, trying old API");
+                        //continue;
                     }
 
                     while (msgs.hasMoreElements())
diff --git a/muttator/install.rdf b/muttator/install.rdf
index e02650d2..3785bda0 100644
--- a/muttator/install.rdf
+++ b/muttator/install.rdf
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-    <Description about="urn:mozilla:install-manifest">
-	<em:id>muttator@mozdev.org</em:id>
-	<em:name>Muttator</em:name>
-	<em:version>###VERSION###</em:version>
-	<em:description>Make Thunderbird behave like Vim</em:description>
-	<em:creator>Martin Stubenschrott</em:creator>
-	<em:homepageURL>http://vimperator.org/</em:homepageURL>
-	<em:iconURL>chrome://muttator/skin/icon.png</em:iconURL>
-	<em:file>
-	    <Description about="urn:mozilla:extension:file:vimperator.jar">
-			<em:package>content/muttator/</em:package>
-	    </Description>
-	</em:file>
-
-	<em:targetApplication>
-	    <Description>
-		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-		<em:minVersion>3.0a1pre</em:minVersion>
-		<em:maxVersion>3.0b2pre</em:maxVersion>
-	    </Description>
-	</em:targetApplication>
-
-    </Description>
-</RDF>
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+    <Description about="urn:mozilla:install-manifest">
+	<em:id>muttator@mozdev.org</em:id>
+	<em:name>Muttator</em:name>
+	<em:version>###VERSION###</em:version>
+	<em:description>Make Thunderbird behave like Vim</em:description>
+	<em:creator>Martin Stubenschrott</em:creator>
+	<em:homepageURL>http://vimperator.org/</em:homepageURL>
+	<em:iconURL>chrome://muttator/skin/icon.png</em:iconURL>
+	<em:file>
+	    <Description about="urn:mozilla:extension:file:vimperator.jar">
+			<em:package>content/muttator/</em:package>
+	    </Description>
+	</em:file>
+
+	<em:targetApplication>
+	    <Description>
+		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+		<em:minVersion>3.0b2pre</em:minVersion>
+		<em:maxVersion>3.0b2</em:maxVersion>
+	    </Description>
+	</em:targetApplication>
+
+    </Description>
+</RDF>