Revert "iMessage fix"

This reverts commit 747daf2f23094158e93362967892ae0fc14c631f.