diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/AsymmetricOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/AsymmetricOperationTests.java
index 15de32c8a..778406d2a 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/AsymmetricOperationTests.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/AsymmetricOperationTests.java
@@ -25,7 +25,6 @@ import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.widget.AdapterView;
 
-import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -41,19 +40,21 @@ import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.action.ViewActions.typeText;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.contrib.DrawerActions.openDrawer;
+import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.not;
 import static org.sufficientlysecure.keychain.TestHelpers.checkSnackbar;
 import static org.sufficientlysecure.keychain.TestHelpers.importKeysFromResource;
 import static org.sufficientlysecure.keychain.TestHelpers.randomString;
 import static org.sufficientlysecure.keychain.actions.CustomActions.tokenEncryptViewAddToken;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.isRecyclerItemView;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withEncryptionStatus;
 import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId;
-import static org.sufficientlysecure.keychain.matcher.DrawableMatcher.withDrawable;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureMyKey;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withSignatureNone;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -109,20 +110,11 @@ public class AsymmetricOperationTests {
             onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
             onView(withText(R.string.btn_unlock)).perform(click());
 
-            onView(withId(R.id.decrypt_text_plaintext)).check(matches(
-                    withText(cleartext)));
 
-            onView(withId(R.id.result_encryption_text)).check(matches(
-                    withText(R.string.decrypt_result_encrypted)));
-            onView(withId(R.id.result_signature_text)).check(matches(
-                    withText(R.string.decrypt_result_no_signature)));
-            onView(withId(R.id.result_signature_layout)).check(matches(
-                    not(isDisplayed())));
+            onView(isRecyclerItemView(R.id.decrypted_files_list,
+                    hasDescendant(withText(R.string.filename_unknown_text))))
+                    .check(matches(allOf(withEncryptionStatus(true), withSignatureNone())));
 
-            onView(withId(R.id.result_encryption_icon)).check(matches(
-                    withDrawable(R.drawable.status_lock_closed_24dp)));
-            onView(withId(R.id.result_signature_icon)).check(matches(
-                    withDrawable(R.drawable.status_signature_unknown_cutout_24dp)));
         }
 
     }
@@ -159,20 +151,9 @@ public class AsymmetricOperationTests {
             onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
             onView(withText(R.string.btn_unlock)).perform(click());
 
-            onView(withId(R.id.decrypt_text_plaintext)).check(matches(
-                    withText(cleartext)));
-
-            onView(withId(R.id.result_encryption_text)).check(matches(
-                    withText(R.string.decrypt_result_encrypted)));
-            onView(withId(R.id.result_signature_text)).check(matches(
-                    withText(R.string.decrypt_result_no_signature)));
-            onView(withId(R.id.result_signature_layout)).check(matches(
-                    not(isDisplayed())));
-
-            onView(withId(R.id.result_encryption_icon)).check(matches(
-                    withDrawable(R.drawable.status_lock_closed_24dp)));
-            onView(withId(R.id.result_signature_icon)).check(matches(
-                    withDrawable(R.drawable.status_signature_unknown_cutout_24dp)));
+            onView(isRecyclerItemView(R.id.decrypted_files_list,
+                    hasDescendant(withText(R.string.filename_unknown_text))))
+                    .check(matches(allOf(withEncryptionStatus(true), withSignatureNone())));
 
         }
 
@@ -181,20 +162,9 @@ public class AsymmetricOperationTests {
 
         { // decrypt again, passphrase should be cached
 
-            onView(withId(R.id.decrypt_text_plaintext)).check(matches(
-                    withText(cleartext)));
-
-            onView(withId(R.id.result_encryption_text)).check(matches(
-                    withText(R.string.decrypt_result_encrypted)));
-            onView(withId(R.id.result_signature_text)).check(matches(
-                    withText(R.string.decrypt_result_no_signature)));
-            onView(withId(R.id.result_signature_layout)).check(matches(
-                    not(isDisplayed())));
-
-            onView(withId(R.id.result_encryption_icon)).check(matches(
-                    withDrawable(R.drawable.status_lock_closed_24dp)));
-            onView(withId(R.id.result_signature_icon)).check(matches(
-                    withDrawable(R.drawable.status_signature_unknown_cutout_24dp)));
+            onView(isRecyclerItemView(R.id.decrypted_files_list,
+                    hasDescendant(withText(R.string.filename_unknown_text))))
+                    .check(matches(allOf(withEncryptionStatus(true), withSignatureNone())));
 
         }
 
@@ -239,21 +209,9 @@ public class AsymmetricOperationTests {
 
         { // decrypt
 
-            onView(withId(R.id.decrypt_text_plaintext)).check(matches(
-                    // startsWith because there may be extra newlines
-                    withText(CoreMatchers.startsWith(cleartext))));
-
-            onView(withId(R.id.result_encryption_text)).check(matches(
-                    withText(R.string.decrypt_result_not_encrypted)));
-            onView(withId(R.id.result_signature_text)).check(matches(
-                    withText(R.string.decrypt_result_signature_secret)));
-            onView(withId(R.id.result_signature_layout)).check(matches(
-                    isDisplayed()));
-
-            onView(withId(R.id.result_encryption_icon)).check(matches(
-                    withDrawable(R.drawable.status_lock_open_24dp)));
-            onView(withId(R.id.result_signature_icon)).check(matches(
-                    withDrawable(R.drawable.status_signature_verified_cutout_24dp)));
+            onView(isRecyclerItemView(R.id.decrypted_files_list,
+                    hasDescendant(withText(R.string.filename_unknown))))
+                    .check(matches(allOf(withEncryptionStatus(false), withSignatureMyKey())));
 
         }
 
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
index 42f8d8849..abfe4d04d 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
@@ -128,7 +128,7 @@ public abstract class CustomMatchers {
         } else {
             return allOf(
                 hasDescendant(allOf(
-                        withId(R.id.result_encryption_text), withText(R.string.decrypt_result_encrypted))),
+                        withId(R.id.result_encryption_text), withText(R.string.decrypt_result_not_encrypted))),
                 hasDescendant(allOf(
                         withId(R.id.result_encryption_icon), withDrawable(R.drawable.status_lock_open_24dp, true)))
             );
@@ -152,7 +152,7 @@ public abstract class CustomMatchers {
 
         return allOf(
             hasDescendant(allOf(
-                    withId(R.id.result_signature_text), withText(R.string.decrypt_result_signature_secret))),
+                    withId(R.id.result_signature_text), withText(R.string.decrypt_result_signature_certified))),
             hasDescendant(allOf(
                     withId(R.id.result_signature_icon), withDrawable(R.drawable.status_signature_verified_cutout_24dp, true))),
             hasDescendant(allOf(