diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 862c4f417..53cadc3a1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.fsck.k9"
-    android:versionCode="21"
-    android:versionName="0.21"
+    android:versionCode="22"
+    android:versionName="0.22"
     >
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
diff --git a/src/com/fsck/k9/k9.java b/src/com/fsck/k9/k9.java
index d0806e115..be8053850 100644
--- a/src/com/fsck/k9/k9.java
+++ b/src/com/fsck/k9/k9.java
@@ -41,7 +41,7 @@ public class k9 extends Application {
      * with Intent.ACTION_SEND.
      */
     public static final String[] ACCEPTABLE_ATTACHMENT_SEND_TYPES = new String[] {
-        "image/*",
+        "*/*",
     };
 
     /**
@@ -64,7 +64,7 @@ public class k9 extends Application {
      * The MIME type(s) of attachments we're willing to download to SD.
      */
     public static final String[] ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES = new String[] {
-        "image/*",
+        "*/*",
     };
 
     /**