diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 8c6a62283..d0be052d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -109,9 +109,6 @@ public class KeyListFragment extends LoaderFragment
 
     private String mQuery;
     private SearchView mSearchView;
-    // empty list layout
-    private Button mButtonEmptyCreate;
-    private Button mButtonEmptyImport;
 
     boolean hideMenu = false;
 
@@ -126,27 +123,6 @@ public class KeyListFragment extends LoaderFragment
         mStickyList = (StickyListHeadersListView) view.findViewById(R.id.key_list_list);
         mStickyList.setOnItemClickListener(this);
 
-        // empty view
-        mButtonEmptyCreate = (Button) view.findViewById(R.id.key_list_empty_button_create);
-        mButtonEmptyCreate.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), CreateKeyActivity.class);
-                startActivityForResult(intent, 0);
-            }
-        });
-        mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import);
-        mButtonEmptyImport.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), ImportKeysActivity.class);
-                intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
-                startActivityForResult(intent, 0);
-            }
-        });
-
         mSwipeRefreshLayout = (ListAwareSwipeRefreshLayout) view.findViewById(R.id.key_list_swipe_container);
         mSwipeRefreshLayout.setOnRefreshListener(new NoScrollableSwipeRefreshLayout.OnRefreshListener() {
             @Override
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 69096f03e..6529a88e0 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -36,50 +36,6 @@
                 android:text="@string/key_list_empty_text1"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:gravity="center"
-                android:text="@string/key_list_empty_text2"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <Button
-                android:id="@+id/key_list_empty_button_create"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:textSize="14sp"
-                android:text="@string/key_list_empty_button_create"
-                android:drawableLeft="@drawable/ic_action_new_account"
-                android:drawablePadding="8dp"
-                android:background="@drawable/button_edgy" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:gravity="center"
-                android:text="@string/key_list_empty_text3"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <Button
-                android:id="@+id/key_list_empty_button_import"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:textSize="14sp"
-                android:text="@string/key_list_empty_button_import"
-                android:drawableLeft="@drawable/ic_action_collection"
-                android:drawablePadding="8dp"
-                android:background="@drawable/button_edgy" />
         </LinearLayout>
     </FrameLayout>
 </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3f5e88091..73d5c612c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -506,11 +506,7 @@
         <item quantity="other">"%d keys selected."</item>
     </plurals>
 
-    <string name="key_list_empty_text1">"No keys available yet…"</string>
-    <string name="key_list_empty_text2">"You can start by"</string>
-    <string name="key_list_empty_text3">"or"</string>
-    <string name="key_list_empty_button_create">"creating your own key"</string>
-    <string name="key_list_empty_button_import">"importing an existing key."</string>
+    <string name="key_list_empty_text1">"No keys found!"</string>
     <string name="key_list_filter_show_all">"Show all keys"</string>
     <string name="key_list_filter_show_certified">"Show certified keys only"</string>