1 files changed, 6 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index c6b2d196a..e38044526 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -693,7 +693,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
             signOnly = (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0);
         }
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_ENCRYPT_SIGN);
+        intent.setAction(KeychainIntentService.ACTION_ENCRYPT_SIGN);
 
         // choose default settings, target and data bundle by target
         if (mStreamAndReturnUri != null) {
@@ -778,7 +778,11 @@ public class EncryptActivity extends SherlockFragmentActivity {
                         Log.d(Constants.TAG, "output: " + output);
 
                         Intent emailIntent = new Intent(Intent.ACTION_SEND);
-                        emailIntent.setType("text/plain; charset=utf-8");
+
+                        //Type is set to text/plain so that encrypted messages can
+                        //be sent with Whatsapp, Hangouts, SMS etc...
+                        emailIntent.setType("text/plain");
+						
                         emailIntent.putExtra(Intent.EXTRA_TEXT, output);
                         if (mSubject != null) {
                             emailIntent.putExtra(Intent.EXTRA_SUBJECT, mSubject);