am 1f6dc6d4: am 34d50cb7: Empty draft created on deleting a group MMS message

* commit '1f6dc6d4e51431c8c825753bcfdef4d001dc99a2':
  Empty draft created on deleting a group MMS message
diff --git a/src/java/com/google/android/mms/pdu/PduPersister.java b/src/java/com/google/android/mms/pdu/PduPersister.java
index 7e68b21..162d036 100644
--- a/src/java/com/google/android/mms/pdu/PduPersister.java
+++ b/src/java/com/google/android/mms/pdu/PduPersister.java
@@ -1339,13 +1339,13 @@
                     loadRecipients(PduHeaders.TO, recipients, addressMap, false);
                     break;
             }
-
+            long threadId = 0;
             if (createThreadId && !recipients.isEmpty()) {
                 // Given all the recipients associated with this message, find (or create) the
                 // correct thread.
-                long threadId = Threads.getOrCreateThreadId(mContext, recipients);
-                values.put(Mms.THREAD_ID, threadId);
+                threadId = Threads.getOrCreateThreadId(mContext, recipients);
             }
+            values.put(Mms.THREAD_ID, threadId);
         }
 
         // Save parts first to avoid inconsistent message is loaded