diff --git a/.gitignore b/.gitignore
index 0b67dd66..70f6032d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,10 @@
 ## For rejects
 *.orig
 *.rej
+*.ancestor
+*.current
+*.patched
 
 ## Generated by StGit
 patches-*
+.stgit-edit.txt
diff --git a/common/content/events.js b/common/content/events.js
index 242f9e61..5478322a 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -769,8 +769,11 @@ function Events() //{{{
             // removeEventListeners() to avoid mem leaks
             liberator.dump("TODO: remove all eventlisteners");
 
-            if (typeof getBrowser != "undefined")
+            try
+            {
                 getBrowser().removeProgressListener(this.progressListener);
+            }
+            catch (e) {}
 
             window.removeEventListener("popupshown", enterPopupMode, true);
             window.removeEventListener("popuphidden", exitPopupMode, true);
diff --git a/muttator/content/mail.js b/muttator/content/mail.js
index e0e9bbef..61242230 100644
--- a/muttator/content/mail.js
+++ b/muttator/content/mail.js
@@ -89,9 +89,9 @@ function Mail() //{{{
     var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event;
     mailSession.AddFolderListener(folderListener, notifyFlags);
 
-    function getFolderCompletions(filter)
+    function getFolderCompletions(context)
     {
-        let folders = mail.getFolders(filter);
+        let folders = mail.getFolders(context.filter);
         context.completions = folders.map(function (folder)
                 [folder.server.prettyName + ": " + folder.name,
                  "Unread: " + folder.getNumUnread(false)]);
diff --git a/vimperator/Donors b/vimperator/Donors
index 88996c93..46fa3099 100644
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -1,4 +1,7 @@
 2009:
+* InspireFocus
+* Michael Fremont
+* Kamil Dworakowski
 * Jonathan Austin
 * Steven Romanow