From c644a98a47a55988ccaced80c414ebca674d3e93 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Mon, 28 Sep 2020 20:31:36 +0100
Subject: [PATCH] komrade update!

---
 komrade/backend/crypt.py    |  4 ++++
 komrade/backend/messages.py | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/komrade/backend/crypt.py b/komrade/backend/crypt.py
index 576bd1b..eee4d2c 100644
--- a/komrade/backend/crypt.py
+++ b/komrade/backend/crypt.py
@@ -81,6 +81,10 @@ class Crypt(Logger):
 
     def package_key(self,k,prefix=''):
         if not k: return b''
+        
+        # @DANGEROUS!?!!!!!
+        prefix=f'''{prefix}{'/' if not prefix.endswith('/') else ''}{self.name}/'''
+        
         k_b = self.force_binary(k)
         k_b2 = self.force_binary(prefix) + k_b
         return k_b2
diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py
index 89a15cf..482328a 100644
--- a/komrade/backend/messages.py
+++ b/komrade/backend/messages.py
@@ -54,11 +54,22 @@ class Message(Logger):
 
         # return str(msg)
         msg_s = wrapp(str(msg))
-        hdr='#'*CLI_WIDTH        
+        hdr='#'*CLI_WIDTH
+        from datetime import datetime
+
+        self.log('msg_d',self.msg_d)
+
+        if self.timestamp:
+            dt_object = datetime.fromtimestamp(self.timestamp)
+            timestr = dt_object.strftime("%-d %b %Y %H:%M") 
+        else:
+            timestr = '?'
+        
         return f"""
 {hdr}
 from: @{self.from_name if self.from_name else ''} 
 to:   @{self.to_name if self.to_name else ''}
+on:   {timestr}
 {hdr}
 
 {msg_s}