diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index a96e03cd6..c125b6132 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -106,7 +106,11 @@ public class NewConversationActivity extends ContactSelectionActivity {
     String textToShare = mailtoQueryMap.get(SUBJECT);
     String body = mailtoQueryMap.get(BODY);
     if (body != null && !body.isEmpty()) {
-      textToShare += "\n" + body;
+      if (textToShare != null && !textToShare.isEmpty()) {
+        textToShare += "\n" + body;
+      } else {
+        textToShare = body;
+      }
     }
     return textToShare;
   }