diff --git a/FAQ.md b/FAQ.md
index 4f5cb9562a..0ca71dd790 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -355,6 +355,8 @@ You can enable *Encrypt by default* in the identity settings.
 
 Encryption is [Autocrypt](https://autocrypt.org/) compatible. For security reasons received messages are not decrypted automatically.
 
+The decrypted message text and decrypted attachments are stored. If you want to undo this, you can use the *resync* message 'more' menu.
+
 Inline PGP in received messages is supported, but inline PGP in outgoing messages is not supported,
 see [here](https://josefsson.org/inline-openpgp-considered-harmful.html) about why not.
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 966051679e..f0d3b11850 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2149,6 +2149,41 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             .putExtra("id", data.message.id));
         }
 
+        private void onMenuResync(ActionData data) {
+            Bundle args = new Bundle();
+            args.putLong("id", data.message.id);
+
+            new SimpleTask<Void>() {
+                @Override
+                protected Void onExecute(Context context, Bundle args) {
+                    long id = args.getLong("id");
+
+                    DB db = DB.getInstance(context);
+                    try {
+                        db.beginTransaction();
+
+                        EntityMessage message = db.message().getMessage(id);
+                        if (message == null || message.uid == null)
+                            return null;
+                        db.message().deleteMessage(id);
+
+                        EntityOperation.sync(context, message.folder, true);
+
+                        db.setTransactionSuccessful();
+                    } finally {
+                        db.endTransaction();
+                    }
+
+                    return null;
+                }
+
+                @Override
+                protected void onException(Bundle args, Throwable ex) {
+                    Helper.unexpectedError(context, owner, ex);
+                }
+            }.execute(context, owner, args, "message:share");
+        }
+
         private void onMenuCreateRule(ActionData data) {
             Intent rule = new Intent(ActivityView.ACTION_EDIT_RULE);
             rule.putExtra("account", data.message.account);
@@ -2535,6 +2570,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_decrypt).setEnabled(
                     data.message.content && data.message.to != null && data.message.to.length > 0);
 
+            popupMenu.getMenu().findItem(R.id.menu_resync).setEnabled(data.message.uid != null);
+
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(MenuItem target) {
@@ -2561,6 +2598,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         case R.id.menu_decrypt:
                             onMenuDecrypt(data);
                             return true;
+                        case R.id.menu_resync:
+                            onMenuResync(data);
+                            return true;
                         case R.id.menu_create_rule:
                             onMenuCreateRule(data);
                             return true;
diff --git a/app/src/main/res/menu/menu_message.xml b/app/src/main/res/menu/menu_message.xml
index 74820501a5..8fa34fa351 100644
--- a/app/src/main/res/menu/menu_message.xml
+++ b/app/src/main/res/menu/menu_message.xml
@@ -28,6 +28,10 @@
         android:id="@+id/menu_decrypt"
         android:title="@string/title_decrypt" />
 
+    <item
+        android:id="@+id/menu_resync"
+        android:title="@string/title_resync" />
+
     <item
         android:id="@+id/menu_create_rule"
         android:title="@string/title_create_rule" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f0947da57..31aae847bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -422,6 +422,7 @@
 
     <string name="title_encrypt">Encrypt</string>
     <string name="title_decrypt">Decrypt</string>
+    <string name="title_resync">Resync</string>
     <string name="title_no_openpgp">OpenKeychain not found</string>
     <string name="title_not_encrypted">Message is not encrypted</string>