diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 9a95c77f0f..6386da59a6 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1788,10 +1788,6 @@ public class ServiceSynchronize extends LifecycleService {
             }
 
             db.identity().setIdentityState(ident.id, "connected");
-            db.identity().setIdentityError(ident.id, null);
-
-            NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-            nm.cancel("send", message.identity.intValue());
 
             // Send message
             Address[] to = imessage.getAllRecipients();
@@ -1799,6 +1795,11 @@ public class ServiceSynchronize extends LifecycleService {
             EntityLog.log(this, "Sent via " + ident.host + "/" + ident.user +
                     " to " + TextUtils.join(", ", to));
 
+            db.identity().setIdentityError(ident.id, null);
+
+            NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            nm.cancel("send", message.identity.intValue());
+
             // Append replied/forwarded text
             if (message.replying != null || message.forwarding != null) {
                 String html = message.read(this);