diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java
index c3fdb832b..979875c1a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java
@@ -115,9 +115,11 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
             view.setKeyStatus(keyHealthStatus);
             view.setPrimaryExpiryDate(subkeyStatus.keyCertify.mExpiry);
             view.setShowExpander(false);
+            view.hideExpandedInfo();
         } else {
             view.setKeyStatus(keyHealthStatus);
             view.setShowExpander(keyHealthStatus != KeyHealthStatus.REVOKED);
+            view.hideExpandedInfo();
         }
     }
 
diff --git a/OpenKeychain/src/main/res/layout/key_health_card_content.xml b/OpenKeychain/src/main/res/layout/key_health_card_content.xml
index 71a62d86d..31b942a59 100644
--- a/OpenKeychain/src/main/res/layout/key_health_card_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_health_card_content.xml
@@ -70,7 +70,9 @@
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:id="@+id/key_health_divider"
-        android:background="?android:attr/listDivider" />
+        android:background="?android:attr/listDivider"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <LinearLayout
         android:orientation="vertical"
@@ -122,18 +124,24 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
         android:id="@+id/key_expiry_layout"
         android:visibility="gone"
         tools:visibility="visible">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            />
+
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             android:id="@+id/key_expiry_text"
             android:textAppearance="?android:textAppearanceSmall"
             tools:text="@string/key_expiry_text"
diff --git a/OpenKeychain/src/main/res/layout/subkey_status_card_content.xml b/OpenKeychain/src/main/res/layout/subkey_status_card_content.xml
index 51f980ad5..ab6a23a74 100644
--- a/OpenKeychain/src/main/res/layout/subkey_status_card_content.xml
+++ b/OpenKeychain/src/main/res/layout/subkey_status_card_content.xml
@@ -1,7 +1,9 @@
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:showIn="@layout/tools_vertlin">
+    tools:parentTag="LinearLayout"
+    tools:layout_width="match_parent"
+    tools:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="horizontal"