1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
index 6d51de2..be94fa1 100644
--- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
@@ -77,6 +77,14 @@ public class ShareIntentActivity extends BaseBugleActivity implements
     public void onAttachFragment(final Fragment fragment) {
         final Intent intent = getIntent();
         final String action = intent.getAction();
+
+        String sharedSubject = null;
+        if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
+            sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+        } else if (intent.hasExtra(Intent.EXTRA_TITLE)) {
+            sharedSubject = intent.getStringExtra(Intent.EXTRA_TITLE);
+        }
+
         if (Intent.ACTION_SEND.equals(action)) {
             final Uri contentUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
             if (UriUtil.isFileUri(contentUri)) {
@@ -94,7 +102,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
             if (ContentType.TEXT_PLAIN.equals(contentType)) {
                 final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
                 if (sharedText != null) {
-                    mDraftMessage = MessageData.createSharedMessage(sharedText);
+                    mDraftMessage = MessageData.createSharedMessage(sharedText, sharedSubject);
                 } else {
                     mDraftMessage = null;
                 }
@@ -103,7 +111,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
                     ContentType.isAudioType(contentType) ||
                     ContentType.isVideoType(contentType)) {
                 if (contentUri != null) {
-                    mDraftMessage = MessageData.createSharedMessage(null);
+                    mDraftMessage = MessageData.createSharedMessage(null, sharedSubject);
                     addSharedImagePartToDraft(contentType, contentUri);
                 } else {
                     mDraftMessage = null;
@@ -123,7 +131,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
                 final ArrayList<Uri> imageUris = intent.getParcelableArrayListExtra(
                         Intent.EXTRA_STREAM);
                 if (imageUris != null && imageUris.size() > 0) {
-                    mDraftMessage = MessageData.createSharedMessage(null);
+                    mDraftMessage = MessageData.createSharedMessage(null, sharedSubject);
                     for (final Uri imageUri : imageUris) {
                         if (UriUtil.isFileUri(imageUri)) {
                             LogUtil.i(