1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/isode/stroke/elements/Message.java b/src/com/isode/stroke/elements/Message.java
index 1bb601a..a0c8daa 100644
--- a/src/com/isode/stroke/elements/Message.java
+++ b/src/com/isode/stroke/elements/Message.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015, Isode Limited, London, England.
+ * Copyright (c) 2010-2016, Isode Limited, London, England.
  * All rights reserved.
  */
 package com.isode.stroke.elements;
@@ -31,14 +31,20 @@ public class Message extends Stanza {
 
     public String getBody() {
         Body body = getPayload(new Body());
+        String bodyData = null;
         if (body != null) {
-            return body.getText();
+            bodyData = body.getText();
         }
-        return "";
+        return bodyData;
     }
 
     public void setBody(String body) {
-        updatePayload(new Body(body));
+        if (body != null) {
+            updatePayload(new Body(body));
+        }
+        else {
+            removePayload(new Body());
+        }
     }
 
     public boolean isError() {