diff --git a/src/message.rs b/src/message.rs
index ae121eff0..8c1a3106a 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -212,10 +212,9 @@ SELECT ?1, rfc724_mid, pre_rfc724_mid, timestamp, ?, ? FROM msgs WHERE id=?1
         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_display_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}");
         }
@@ -263,7 +262,7 @@ SELECT ?1, rfc724_mid, pre_rfc724_mid, timestamp, ?, ? FROM msgs WHERE id=?1
 
                 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}");
diff --git a/src/receive_imf/receive_imf_tests.rs b/src/receive_imf/receive_imf_tests.rs
index 46256c5c0..151637f8e 100644
--- a/src/receive_imf/receive_imf_tests.rs
+++ b/src/receive_imf/receive_imf_tests.rs
@@ -4748,7 +4748,7 @@ async fn test_list_from() -> Result<()> {
         "clubinfo@donotreply.oeamtc.at"
     );
     let info = msg.id.get_info(t).await?;
-    assert!(info.contains(" by ~ÖAMTC (clubinfo@donotreply.oeamtc.at)"));
+    assert!(info.contains(" by ~ÖAMTC"));
 
     Ok(())
 }