Revert "Merge branch 'messages_sharedpref'"

This reverts commit 62ff3c57d6484de40a28d0e7a827ee7571a7c641.