diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 648f087a83..51c5abe7a4 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -41,6 +41,8 @@ import androidx.core.content.ContextCompat;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
 
+import com.sun.mail.smtp.SMTPSendFailedException;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -628,6 +630,18 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
         } catch (MessagingException ex) {
             Log.e(ex);
 
+            if (ex instanceof SMTPSendFailedException) {
+                SMTPSendFailedException sem = (SMTPSendFailedException) ex;
+                ex = new SMTPSendFailedException(
+                        sem.getCommand(),
+                        sem.getReturnCode(),
+                        getString(R.string.title_service_auth, sem.getMessage()),
+                        sem.getNextException(),
+                        sem.getValidSentAddresses(),
+                        sem.getValidUnsentAddresses(),
+                        sem.getInvalidAddresses());
+            }
+
             if (sid != null)
                 db.message().deleteMessage(sid);