diff --git a/res/values/strings.xml b/res/values/strings.xml
index eeb0fd8..f9761ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,4 +13,5 @@
     <string name="folder_trash">Trash</string>
 
     <string name="folder_empty">Folder is empty</string>
+    <string name="folder_does_not_exist">Folder does not exist</string>
 </resources>
diff --git a/src/i2p/bote/FolderFragment.java b/src/i2p/bote/FolderFragment.java
index 27508e8..fbf916a 100644
--- a/src/i2p/bote/FolderFragment.java
+++ b/src/i2p/bote/FolderFragment.java
@@ -33,15 +33,19 @@ public class FolderFragment extends ListFragment implements
         String folderName = getArguments().getString(FOLDER_NAME);
         mFolder = BoteHelper.getMailFolder(folderName);
 
-        getActivity().setTitle(BoteHelper.getFolderDisplayName(getActivity(), mFolder));
-
         setListAdapter(mAdapter);
-        setEmptyText(getResources().getString(
-                R.string.folder_empty));
 
-        setListShown(false);
-        if (mFolder != null)
+        if (mFolder == null) {
+            setEmptyText(getResources().getString(
+                    R.string.folder_does_not_exist));
+            getActivity().setTitle(getResources().getString(R.string.app_name));
+        } else {
+            setListShown(false);
+            setEmptyText(getResources().getString(
+                    R.string.folder_empty));
+            getActivity().setTitle(BoteHelper.getFolderDisplayName(getActivity(), mFolder));
             getLoaderManager().initLoader(EMAIL_LIST_LOADER, null, this);
+        }
     }
 
     // LoaderManager.LoaderCallbacks<List<Email>>