diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py
index 4ab1217..f04a8be 100644
--- a/komrade/backend/messages.py
+++ b/komrade/backend/messages.py
@@ -66,12 +66,12 @@ class Message(Logger):
             msg=self.msg
         return f"""    
     from: @{self.from_name if self.from_name else ''} 
-          ({self.from_pubkey})
+          ({b64enc_s(self.from_pubkey)})
     
     to:   @{self.to_name if self.to_name else ''}
-          ({self.to_pubkey})
+          ({b64enc_s(self.to_pubkey)})
 
-    msg:  {msg}
+    msg:  {b64enc(msg)}
 """
 
 
diff --git a/komrade/utils.py b/komrade/utils.py
index 77238a6..2fbf060 100644
--- a/komrade/utils.py
+++ b/komrade/utils.py
@@ -189,14 +189,15 @@ def d2b64(d):
     return d2
 
 def b64enc(x):
+    if type(x) not in {str,bytes}: return x
     if type(x)==str: x=x.encode()
     if not isBase64(x): x=b64encode(x)
     return x
 
 
-def b64dec(x):
-    if isBase64(x): x=b64decode(x)
-    return x
+def b64enc_s(x):
+    return b64enc(x).decode()
+
 
 
 def hashish(binary_data):