diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index 07462b4ff..c4b437593 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -28,8 +28,10 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
+import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.FileHelper;
+import org.sufficientlysecure.keychain.util.Log;
 
 import java.io.File;
 
@@ -69,41 +71,44 @@ public class DeleteFileDialogFragment extends DialogFragment {
             @Override
             public void onClick(DialogInterface dialog, int id) {
                 dismiss();
-                String scheme = deleteUri.getScheme();
 
-                if(scheme.equals(ContentResolver.SCHEME_FILE)) {
-                    if(new File(deleteUri.getPath()).delete()) {
-                        Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
-                        return;
-                    }
-                }
-                else if(scheme.equals(ContentResolver.SCHEME_CONTENT)) {
-                    // We can not securely delete Uris, so just use usual delete on them
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                // NOTE: Use Toasts, not Snackbars. When sharing to another application snackbars
+                // would not show up!
+
+                // Use DocumentsContract on Android >= 4.4
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    try {
                         if (DocumentsContract.deleteDocument(getActivity().getContentResolver(), deleteUri)) {
-                            Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getActivity(), getActivity().getString(R.string.file_delete_successful,
+                                    deleteFilename), Toast.LENGTH_LONG).show();
                             return;
                         }
-                    }
-
-                    if (getActivity().getContentResolver().delete(deleteUri, null, null) > 0) {
-                        Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
-                        return;
-                    }
-
-                    // some Uri's a ContentResolver fails to delete is handled by the java.io.File's delete
-                    // via the path of the Uri
-                    if(new File(deleteUri.getPath()).delete()) {
-                        Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
-                        return;
+                    } catch (UnsupportedOperationException e) {
+                        Log.d(Constants.TAG, "Catched UnsupportedOperationException, can happen when delete is not supported!", e);
                     }
                 }
 
-                Toast.makeText(getActivity(), getActivity().getString(R.string.error_file_delete_failed,
-                        deleteFilename), Toast.LENGTH_SHORT).show();
+                try {
+                    if (getActivity().getContentResolver().delete(deleteUri, null, null) > 0) {
+                        Toast.makeText(getActivity(), getActivity().getString(R.string.file_delete_successful,
+                                deleteFilename), Toast.LENGTH_LONG).show();
+                        return;
+                    }
+                } catch (UnsupportedOperationException e) {
+                    Log.d(Constants.TAG, "Catched UnsupportedOperationException, can happen when delete is not supported!", e);
+                }
+
+                // some Uri's a ContentResolver fails to delete is handled by the java.io.File's delete
+                // via the path of the Uri
+                if (new File(deleteUri.getPath()).delete()) {
+                    Toast.makeText(getActivity(), getActivity().getString(R.string.file_delete_successful,
+                            deleteFilename), Toast.LENGTH_LONG).show();
+                    return;
+                }
 
                 // Note: We can't delete every file...
-                // If possible we should find out if deletion is possible before even showing the option to do so.
+                Toast.makeText(getActivity(), getActivity().getString(R.string.error_file_delete_failed,
+                        deleteFilename), Toast.LENGTH_LONG).show();
             }
         });
         alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index f2ee4079e..d7f4513d9 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="4dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    style="?android:attr/borderlessButtonStyle">
 
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:padding="4dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        style="@style/SelectableItem">
     <TextView
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:text="@string/btn_add_files"
-            android:drawableLeft="@drawable/ic_folder_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center"/>
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:text="@string/btn_add_files"
+        android:drawableLeft="@drawable/ic_folder_grey_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="center" />
 </FrameLayout>
\ 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 39af9ca28..2c83ac070 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -220,7 +220,7 @@
     <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
     <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
     <string name="file_delete_confirmation">"Are you sure you want to delete\n%s?"</string>
-    <string name="file_delete_successful">"Successfully deleted."</string>
+    <string name="file_delete_successful">"'%s' has been deleted."</string>
     <string name="no_file_selected">"Select a file first."</string>
     <string name="encrypt_sign_successful">"Successfully signed and/or encrypted."</string>
     <string name="encrypt_sign_clipboard_successful">"Successfully signed and/or encrypted to clipboard."</string>
@@ -261,7 +261,7 @@
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"
     -->
-    <string name="error_file_delete_failed">"deleting '%s' failed"</string>
+    <string name="error_file_delete_failed">"Deleting '%s' failed. Please do this manually!"</string>
     <string name="error_file_not_found">"file not found"</string>
     <string name="error_no_secret_key_found">"no suitable secret key found"</string>
     <string name="error_external_storage_not_ready">"external storage not ready"</string>