diff --git a/Monal/another.im/Views/Conversation/ConversationMessageContainer.swift b/Monal/another.im/Views/Conversation/ConversationMessageContainer.swift
index 33b646d..ada6580 100644
--- a/Monal/another.im/Views/Conversation/ConversationMessageContainer.swift
+++ b/Monal/another.im/Views/Conversation/ConversationMessageContainer.swift
@@ -35,15 +35,22 @@ struct MessageAttr: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            Text(message.timestamp, style: .time)
-                .font(.sub2)
-                .foregroundColor(.Material.Shape.separator)
-            Spacer()
-            if message.encrypted {
-                Image(systemName: "lock")
-                    .font(.body3)
+            HStack(spacing: 2) {
+                if !message.isInbound && message.encrypted {
+                    Image(systemName: "lock")
+                        .font(.sub1)
+                        .foregroundColor(.Material.Shape.separator)
+                }
+                Text(message.timestamp, style: .time)
+                    .font(.sub1)
                     .foregroundColor(.Material.Shape.separator)
+                if message.isInbound && message.encrypted {
+                    Image(systemName: "lock")
+                        .font(.sub1)
+                        .foregroundColor(.Material.Shape.separator)
+                }
             }
+            Spacer()
 
             switch message.status {
             case .sent: