diff --git a/src/com/fsck/k9/preferences/Storage.java b/src/com/fsck/k9/preferences/Storage.java
index 4d60c60fe..f1210d84e 100644
--- a/src/com/fsck/k9/preferences/Storage.java
+++ b/src/com/fsck/k9/preferences/Storage.java
@@ -321,7 +321,11 @@ public class Storage implements SharedPreferences {
         if (val == null) {
             return defValue;
         }
-        return Float.parseFloat(val);
+        try{
+        	return Float.parseFloat(val);
+        } catch (NumberFormatException nfe){
+            return defValue;
+        }
     }
 
     //@Override
@@ -330,7 +334,11 @@ public class Storage implements SharedPreferences {
         if (val == null) {
             return defValue;
         }
-        return Integer.parseInt(val);
+        try {
+        	return Integer.parseInt(val);
+        } catch (NumberFormatException nfe){
+            return defValue;
+        }
     }
 
     //@Override
@@ -339,7 +347,11 @@ public class Storage implements SharedPreferences {
         if (val == null) {
             return defValue;
         }
-        return Long.parseLong(val);
+        try{
+        	return Long.parseLong(val);
+        } catch (NumberFormatException nfe){
+        	return defValue;
+        }
     }
 
     //@Override