diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py
index 4c630f8..f15e0c0 100644
--- a/komrade/backend/messages.py
+++ b/komrade/backend/messages.py
@@ -53,13 +53,13 @@ class Message(Logger):
         else:
             msg=self.msg
         return f"""    
-    from: {self.from_name} 
+    from: @{self.from_name} 
           ({b64encode(self.from_pubkey).decode()})
     
-    to:   {self.to_name}
+    to:   @{self.to_name}
           ({b64encode(self.to_pubkey).decode()})
 
-    msg:  {msg}
+    msg:  {isBase64(msg)}
 """