diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index e27c4408e3..7fb4c07d14 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2039,8 +2039,18 @@ class Core {
// Get message
Message imessage = ifolder.getMessageByUID(message.uid);
- if (imessage == null)
- throw new MessageRemovedException();
+ if (imessage == null) {
+ File file = message.getFile(context);
+ Helper.writeText(file, "");
+ db.message().setMessageContent(message.id,
+ true,
+ null,
+ null,
+ null,
+ context.getString(R.string.title_not_existing));
+ return;
+ //throw new MessageRemovedException();
+ }
MessageHelper helper = new MessageHelper((MimeMessage) imessage, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 317a63a77a..d5c25ead58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2230,6 +2230,7 @@
Fetching message again from the server
Go back
Use global default
+ This message no longer exists on the mail server
Actions
Reply with: \'%1$s\'