diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fec178225..03a653c66 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,6 +83,12 @@
                 <data android:mimeType="text/*"/>
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
                 <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java
index 7e31e5f90..80ad13d5e 100644
--- a/src/org/thialfihar/android/apg/DecryptActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptActivity.java
@@ -177,6 +177,19 @@ public class DecryptActivity extends BaseActivity {
             } catch (IOException e) {
                 // ignore, then
             }
+        } else if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_SEND)) {
+            Bundle extras = intent.getExtras();
+            if (extras == null) {
+                extras = new Bundle();
+            }
+            String data = extras.getString(Intent.EXTRA_TEXT);
+            if (data != null) {
+                mMessage.setText(data);
+            }
+            mSubject = extras.getString(Intent.EXTRA_SUBJECT);
+            if (mSubject.startsWith("Fwd: ")) {
+                mSubject = mSubject.substring(5);
+            }
         } else if (intent.getAction() != null && intent.getAction().equals(Apg.Intent.DECRYPT)) {
             Bundle extras = intent.getExtras();
             if (extras == null) {