Merge "Sync address parts before syncing message content" into main

            debug("Map InsertedThread" + results);

            // Some Messenger Applications don't listen to address table changes and only listen

            // for message content changes. Adding the address parts first makes it so they're

            // already in the tables when a given app syncs due to content updates. Otherwise, we

            // risk a race where the address content may not be ready.

            storeAddressPart(message, results);

            for (MimePart part : mmsBmessage.getMimeParts()) {

                storeMmsPart(part, results);

            }

            storeAddressPart(message, results);

        } catch (Exception e) {

            error("Error while storing MMS: " + e.toString());

            throw e;