diff --git a/src/com/android/email/provider/FolderPickerSelectorAdapter.java b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
index c88f7c8f1..565601308 100644
--- a/src/com/android/email/provider/FolderPickerSelectorAdapter.java
+++ b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
@@ -22,7 +22,6 @@ import android.database.Cursor;
 
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
-import com.android.mail.providers.UIProvider.FolderType;
 import com.android.mail.ui.HierarchicalFolderSelectorAdapter;
 
 import java.util.Set;
@@ -40,7 +39,7 @@ public class FolderPickerSelectorAdapter extends HierarchicalFolderSelectorAdapt
      */
     protected boolean meetsRequirements(Folder folder) {
         // We only want to show the non-Trash folders that can accept moved messages
-        return folder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES) ||
-                folder.type == FolderType.TRASH;
+        return folder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES)
+                || folder.isTrash();
     }
 }
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 422d1cd8c..65f3dfb88 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -106,7 +106,7 @@ public class WidgetProvider extends BaseWidgetProvider {
             WidgetService.saveWidgetInformation(context, widgetId, uiAccount,
                     uiFolder.uri.toString());
 
-            updateWidgetInternal(context, widgetId, uiAccount, uiFolder.uri,
+            updateWidgetInternal(context, widgetId, uiAccount, uiFolder.type, uiFolder.uri,
                     uiFolder.conversationListUri, uiFolder.name);
 
             // Now remove the old legacy preference value