diff --git a/messages/src/main/java/de/srsoftware/umbrella/message/model/CombinedMessage.java b/messages/src/main/java/de/srsoftware/umbrella/message/model/CombinedMessage.java
index 95f1ed47..cb88e2ed 100644
--- a/messages/src/main/java/de/srsoftware/umbrella/message/model/CombinedMessage.java
+++ b/messages/src/main/java/de/srsoftware/umbrella/message/model/CombinedMessage.java
@@ -40,12 +40,11 @@ public class CombinedMessage {
 				break;
 			case 1:
 				if (!sender.equals(message.sender())) sender = fallbackSender;
-				combinedBody.insert(0,format("# {0}:\n# {1}:\n\n",sender,subject)); // insert sender and subject of first message right before the body of the first message
+				combinedBody.insert(0,format("# {0} / {1}:\n\n",sender,subject)); // insert sender and subject of first message right before the body of the first message
 				combinedSubject = subjectForCombinedMessage;
 				// no break here, we need to append the subject and content
 			default:
-				combinedBody.append("\n\n# ").append(message.sender()).append(":\n");
-				combinedBody.append("# ").append(subject).append(":\n\n");
+				combinedBody.append("\n-----\n# ").append(message.sender()).append(" / ").append(subject).append(":\n\n");
 				combinedBody.append(body);
 		}
 		if (message.attachments() != null) attachments.addAll(message.attachments());