diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index e27422518b..b3a2774979 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -339,6 +339,9 @@ public interface DaoMessage {
     @Query("UPDATE message SET identity = :identity WHERE id = :id")
     int setMessageIdentity(long id, Long identity);
 
+    @Query("UPDATE message SET `from` = :from WHERE id = :id")
+    int setMessageFrom(long id, String from);
+
     @Query("UPDATE message SET uid = :uid WHERE id = :id")
     int setMessageUid(long id, Long uid);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index f5b4ec545e..47de71d670 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -373,6 +373,7 @@ public class ServiceSend extends ServiceBase {
                 db.beginTransaction();
 
                 db.message().setMessageIdentity(message.id, null);
+                db.message().setMessageFrom(message.id, DB.Converters.encodeAddresses(imessage.getFrom())); // extra
                 db.message().setMessageSent(message.id, time);
                 db.message().setMessageReceiptRequested(message.id, ident.delivery_receipt || ident.read_receipt);
                 db.message().setMessageSeen(message.id, true);