diff --git a/src/message.rs b/src/message.rs
index 249b96fef..fd19e34f8 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -207,10 +207,9 @@ impl MsgId {
         ret += &format!("Sent: {fts}");
 
         let from_contact = Contact::get_by_id(context, msg.from_id).await?;
-        let name = from_contact.get_name_n_addr();
+        let name = from_contact.get_name();
         if let Some(override_sender_name) = msg.get_override_sender_name() {
-            let addr = from_contact.get_addr();
-            ret += &format!(" by ~{override_sender_name} ({addr})");
+            ret += &format!(" by ~{override_sender_name}");
         } else {
             ret += &format!(" by {name}");
         }
@@ -258,7 +257,7 @@ impl MsgId {
 
                 let name = Contact::get_by_id(context, contact_id)
                     .await
-                    .map(|contact| contact.get_name_n_addr())
+                    .map(|contact| contact.get_display_name().to_owned())
                     .unwrap_or_default();
 
                 ret += &format!(" by {name}");