Reviewed commit for FS#34 after merge

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -470,7 +470,7 @@ public class Message extends AbstractEntity {
 	}
 
 	public String getMergedBody() {
-		StringBuilder body = new StringBuilder(this.body.trim());
+		StringBuilder body = new StringBuilder(this.body);
 		Message current = this;
 		while(current.mergeable(current.next())) {
 			current = current.next();

src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java

@@ -159,7 +159,7 @@ public class ServiceDiscoveryResult {
 	}
 
 	public String getVer() {
-		return new String(Base64.encode(this.ver, Base64.DEFAULT)).trim();
+		return new String(Base64.encode(this.ver, Base64.DEFAULT));
 	}
 
 	public ServiceDiscoveryResult(Cursor cursor) throws JSONException {