diff --git a/src/i2p/bote/EmailListFragment.java b/src/i2p/bote/EmailListFragment.java
index c24987b..5e8aa7a 100644
--- a/src/i2p/bote/EmailListFragment.java
+++ b/src/i2p/bote/EmailListFragment.java
@@ -1,6 +1,5 @@
 package i2p.bote;
 
-import java.security.GeneralSecurityException;
 import java.util.List;
 
 import i2p.bote.email.Email;
@@ -79,9 +78,6 @@ public class EmailListFragment extends ListFragment implements
             } catch (PasswordException e) {
                 // TODO: Get password from user and retry
                 getActivity().setTitle("ERROR: " + e.getMessage());
-            } catch (GeneralSecurityException e) {
-                // TODO: Handle properly
-                getActivity().setTitle("ERROR: " + e.getMessage());
             }
             getLoaderManager().initLoader(EMAIL_LIST_LOADER, null, this);
         }
@@ -153,9 +149,6 @@ public class EmailListFragment extends ListFragment implements
         } catch (PasswordException e) {
             // TODO: Get password from user and retry
             getActivity().setTitle("ERROR: " + e.getMessage());
-        } catch (GeneralSecurityException e) {
-            // TODO: Handle properly
-            getActivity().setTitle("ERROR: " + e.getMessage());
         }
 
         if (isResumed()) {
@@ -173,9 +166,6 @@ public class EmailListFragment extends ListFragment implements
         } catch (PasswordException e) {
             // TODO: Get password from user and retry
             getActivity().setTitle("ERROR: " + e.getMessage());
-        } catch (GeneralSecurityException e) {
-            // TODO: Handle properly
-            getActivity().setTitle("ERROR: " + e.getMessage());
         }
     }
 }
diff --git a/src/i2p/bote/FolderListAdapter.java b/src/i2p/bote/FolderListAdapter.java
index 528fb1f..ee2b66e 100644
--- a/src/i2p/bote/FolderListAdapter.java
+++ b/src/i2p/bote/FolderListAdapter.java
@@ -1,6 +1,5 @@
 package i2p.bote;
 
-import java.security.GeneralSecurityException;
 import java.util.List;
 
 import i2p.bote.fileencryption.PasswordException;
@@ -42,9 +41,6 @@ public class FolderListAdapter extends ArrayAdapter<EmailFolder> {
         } catch (PasswordException e) {
             // TODO: Get password from user and retry
             name.setText("ERROR: " + e.getMessage());
-        } catch (GeneralSecurityException e) {
-            // TODO: Handle properly
-            name.setText("ERROR: " + e.getMessage());
         }
 
         return v;
diff --git a/src/i2p/bote/util/BoteHelper.java b/src/i2p/bote/util/BoteHelper.java
index 25cba14..8eec0eb 100644
--- a/src/i2p/bote/util/BoteHelper.java
+++ b/src/i2p/bote/util/BoteHelper.java
@@ -21,9 +21,8 @@ public class BoteHelper extends GeneralHelper {
      * @param showNew Should the name contain the number of new messages?
      * @return The name of the folder.
      * @throws PasswordException
-     * @throws GeneralSecurityException
      */
-    public static String getFolderDisplayName(Context ctx, EmailFolder folder, boolean showNew) throws PasswordException, GeneralSecurityException {
+    public static String getFolderDisplayName(Context ctx, EmailFolder folder, boolean showNew) throws PasswordException {
         String displayName = "";
 
         String name = folder.getName();