From 7cd60d9fcdb470ed4746e149084dae6379772000 Mon Sep 17 00:00:00 2001
From: "daniel.boehrs" <daniel.boehrs@open-xchange.com>
Date: Fri, 14 Jun 2019 10:38:26 +0200
Subject: [PATCH] mailto links with a body but no subject #937

---
 src/org/thoughtcrime/securesms/NewConversationActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
   }