diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index d9eb7f7c24..1ddade7ba2 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1263,7 +1263,7 @@ public class MessageHelper {
         }
 
         try {
-            if (imessage.isMimeType("multipart/signed")) {
+            if (imessage.isMimeType("_multipart/signed_")) {
                 Multipart multipart = (Multipart) imessage.getContent();
                 if (multipart.getCount() == 2) {
                     getMessageParts(multipart.getBodyPart(0), parts, null);
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index ccd28fdfbe..ee4cfd6596 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -153,6 +153,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivLowPriority"
             app:srcCompat="@drawable/baseline_security_24" />
@@ -164,6 +165,7 @@
             android:gravity="center_vertical"
             android:text="@string/title_legend_signed"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/ivSigned"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivSigned"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 851cbbedd4..48e3ce5d97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1153,13 +1153,13 @@
 
     <string-array name="encryptNames">
         <item>None</item>
-        <item>PGP sign-only</item>
+        <!--item>PGP sign-only</item-->
         <item>PGP sign+encrypt</item>
     </string-array>
 
     <integer-array name="encryptValues" translatable="false">
         <item>0</item>
-        <item>2</item>
+        <!--item>2</item-->
         <item>1</item>
     </integer-array>