Adjusted 26406 and 27754 to handle removal of messages.addContactToThisSMS.
Stronger 27754