diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 7d86a1061f..2e4eedeb61 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -493,9 +493,10 @@ public class ConversationFragment extends SherlockListFragment
         extension = "attach";
 
       int i = 0;
-      File file = new File(outputDirectory, base+"."+extension);
-      while (file.exists())
-        file = new File(outputDirectory, base+"-"+(++i)+"."+extension);
+      File file = new File(outputDirectory, base + "." + extension);
+      while (file.exists()) {
+        file = new File(outputDirectory, base + "-" + (++i) + "." + extension);
+      }
 
       return file;
     }