diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift
index c245fe229..1886b514b 100644
--- a/Session/Media Viewing & Editing/MessageInfoView.swift	
+++ b/Session/Media Viewing & Editing/MessageInfoView.swift	
@@ -241,12 +241,14 @@ struct MessageInfoView: View {
                                         alignment: .leading,
                                         spacing: 4
                                     ) {
-                                        Text(messageViewModel.senderName ?? "Tester")
-                                            .bold()
-                                            .font(.system(size: 18))
-                                            .foregroundColor(themeColor: .textPrimary)
+                                        if !messageViewModel.authorName.isEmpty  {
+                                            Text(messageViewModel.authorName)
+                                                .bold()
+                                                .font(.system(size: 18))
+                                                .foregroundColor(themeColor: .textPrimary)
+                                        }
                                         Text(messageViewModel.authorId)
-                                            .font(.system(size: 16))
+                                            .font(.spaceMono(size: 16))
                                             .foregroundColor(themeColor: .textPrimary)
                                     }
                                 }
diff --git a/SessionUIKit/Style Guide/Fonts.swift b/SessionUIKit/Style Guide/Fonts.swift
index d6369b1ae..bf70275d1 100644
--- a/SessionUIKit/Style Guide/Fonts.swift	
+++ b/SessionUIKit/Style Guide/Fonts.swift	
@@ -1,4 +1,5 @@
 import UIKit
+import SwiftUI
 
 @objc(LKFonts)
 public final class Fonts : NSObject {
@@ -11,3 +12,13 @@ public final class Fonts : NSObject {
         return UIFont(name: "SpaceMono-Bold", size: size)!
     }
 }
+
+public extension Font {
+    static func spaceMono(size: CGFloat) -> Font {
+        return Font.custom("SpaceMono-Regular", size: size)
+    }
+    
+    static func boldSpaceMono(size: CGFloat) -> Font {
+        return Font.custom("SpaceMono-Bold", size: size)
+    }
+}