diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index a07eaf5c5a..3d2ac11fb4 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -56,7 +56,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
 // https://developer.android.com/topic/libraries/architecture/room.html
 
 @Database(
-        version = 113,
+        version = 114,
         entities = {
                 EntityIdentity.class,
                 EntityAccount.class,
@@ -1102,6 +1102,16 @@ public abstract class DB extends RoomDatabase {
                         db.execSQL("CREATE INDEX IF NOT EXISTS `index_revision_message` ON `revision` (`message`)");
                         db.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_revision_message_sequence` ON `revision` (`message`, `sequence`)");
                     }
+
+                })
+                .addMigrations(new Migration(113, 114) {
+                    @Override
+                    public void migrate(@NonNull SupportSQLiteDatabase db) {
+                        Log.i("DB migration from version " + startVersion + " to " + endVersion);
+                        db.execSQL("UPDATE message SET encrypt = 1 WHERE id IN " +
+                                "(SELECT DISTINCT message FROM attachment" +
+                                " WHERE encryption = " + EntityAttachment.PGP_MESSAGE + ")");
+                    }
                 })
                 .build();
     }