--- a/toolkit-download-folder.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/toolkit-download-folder.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -6,7 +6,7 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -290,17 +290,17 @@ var gMainPane = {
+@@ -408,17 +408,17 @@ var gMainPane = {
        // and was available as an option in the 1.5 drop down. On XP this
        // was in My Documents, on OSX it was in User Docs. In 2.0, we did
        // away with the drop down option, although the special label was
@@ -17,18 +17,18 @@
        // folder. See nsDownloadManager for details. 
 -      downloadFolder.label = bundlePreferences.getString("downloadsFolderName");
 +      downloadFolder.label = "Downloads";
-       iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
+       iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1));
      } else {
        // 'Desktop'
        downloadFolder.label = bundlePreferences.getString("desktopFolderName");
-       iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop"));
+       iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop"));
      }
      downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";
-     
+   }),
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi
+@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi
    // Vista:
    // Downloads
    // XP/2K: