diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
index 01770ba..54d0665 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
@@ -272,9 +272,11 @@ public class SmsFetcher {
 			existingMessages = _existingDraftsMessages;
 		} else if (_mbID == MailboxID.SENT) {
 			existingMessages = _existingSentMessages;
-		} else {
-            return "";
-        }
+		}
+        
+	        if (existingMessages == null) {
+	        	return "";
+	        }
 
 		// Note: The default case isn't possible, we check the mailbox before
 		StringBuilder sb = new StringBuilder();