diff --git a/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/FakeCoreResourceProvider.kt b/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/FakeCoreResourceProvider.kt
index c5c6c9f968..7a251bedcb 100644
--- a/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/FakeCoreResourceProvider.kt
+++ b/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/FakeCoreResourceProvider.kt
@@ -60,10 +60,6 @@ class FakeCoreResourceProvider : CoreResourceProvider {
         throw UnsupportedOperationException("not implemented")
     }
 
-    override fun encryptedSubject(): String {
-        throw UnsupportedOperationException("not implemented")
-    }
-
     override fun replyHeader(sender: String): String {
         throw UnsupportedOperationException("not implemented")
     }
diff --git a/legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt b/legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt
index 824e0c86d6..ad290bc0ca 100644
--- a/legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt
+++ b/legacy/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt
@@ -28,7 +28,6 @@ class K9CoreResourceProvider(
     override fun noSubject(): String = context.getString(R.string.general_no_subject)
 
     override fun userAgent(): String = context.getString(R.string.message_header_mua)
-    override fun encryptedSubject(): String = context.getString(R.string.encrypted_subject)
 
     override fun replyHeader(sender: String): String =
         context.getString(R.string.message_compose_reply_header_fmt, sender)
diff --git a/legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt b/legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt
index c135a88b5b..2c9d468947 100644
--- a/legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt
+++ b/legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt
@@ -20,7 +20,6 @@ interface CoreResourceProvider {
     fun noSubject(): String
     fun userAgent(): String
 
-    fun encryptedSubject(): String
     fun replyHeader(sender: String): String
     fun replyHeader(sender: String, sentDate: String): String
 
diff --git a/legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java b/legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
index 7fd5349b38..66309ed266 100644
--- a/legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
+++ b/legacy/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
@@ -47,6 +47,7 @@ import timber.log.Timber;
 
 public class PgpMessageBuilder extends MessageBuilder {
     private static final int REQUEST_USER_INTERACTION = 1;
+    private static final String REPLACEMENT_SUBJECT = "[...]";
 
 
     private final AutocryptOperations autocryptOperations;
@@ -220,7 +221,7 @@ public class PgpMessageBuilder extends MessageBuilder {
             messageContentBodyPart.setHeader(MimeHeader.HEADER_CONTENT_TYPE,
                     messageContentBodyPart.getContentType() + "; protected-headers=\"v1\"");
             messageContentBodyPart.setHeader(MimeHeader.SUBJECT, subjects[0]);
-            currentProcessedMimeMessage.setSubject(resourceProvider.encryptedSubject());
+            currentProcessedMimeMessage.setSubject(REPLACEMENT_SUBJECT);
         }
     }
 
diff --git a/legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt b/legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
index 21cd52efa5..314fe4bcd0 100644
--- a/legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
+++ b/legacy/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
@@ -21,7 +21,6 @@ class TestCoreResourceProvider : CoreResourceProvider {
     override fun noSubject() = "(No subject)"
 
     override fun userAgent(): String = "K-9 Mail for Android"
-    override fun encryptedSubject(): String = "Encrypted message"
 
     override fun replyHeader(sender: String) = "$sender wrote:"
     override fun replyHeader(sender: String, sentDate: String) = "On $sentDate, $sender wrote:"
diff --git a/legacy/ui/legacy/src/main/res/values/strings.xml b/legacy/ui/legacy/src/main/res/values/strings.xml
index f24b306a24..a40685e598 100644
--- a/legacy/ui/legacy/src/main/res/values/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values/strings.xml
@@ -1025,7 +1025,6 @@
     <string name="dialog_openkeychain_info_install">Install</string>
     <string name="dialog_openkeychain_info_text">The app OpenKeychain is required to enable support for end-to-end encryption.</string>
 
-    <string name="encrypted_subject">"Encrypted Message"</string>
     <string name="account_settings_crypto_encrypt_subject">Encrypt message subjects</string>
     <string name="account_settings_crypto_encrypt_subject_subtitle">May not be supported by some recipients</string>
 
diff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
index 5b52da3e93..f7cf4439b5 100644
--- a/legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
+++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
@@ -21,7 +21,6 @@ class TestCoreResourceProvider : CoreResourceProvider {
     override fun noSubject() = throw UnsupportedOperationException("not implemented")
 
     override fun userAgent(): String = "K-9 Mail for Android"
-    override fun encryptedSubject(): String = "Encrypted message"
 
     override fun replyHeader(sender: String) = throw UnsupportedOperationException("not implemented")
     override fun replyHeader(sender: String, sentDate: String) = throw UnsupportedOperationException("not implemented")