diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/src/com/fsck/k9/helper/FileBrowserHelper.java
index 2ef2c78e9..3c8634c57 100644
--- a/src/com/fsck/k9/helper/FileBrowserHelper.java
+++ b/src/com/fsck/k9/helper/FileBrowserHelper.java
@@ -83,9 +83,8 @@ public class FileBrowserHelper {
             String intentAction = PICK_DIRECTORY_INTENTS[listIndex][0];
             String uriPrefix = PICK_DIRECTORY_INTENTS[listIndex][1];
         	Intent intent = new Intent(intentAction);
-        	if (startPath != null) {
-                intent.setData(Uri.parse(uriPrefix + startPath.getPath()));
-        	}
+        	intent.setData(Uri.parse(uriPrefix + startPath.getPath()));
+
         	try {
                 c.startActivityForResult(intent, requestcode);
                 success = true;