Rewrote Messages/Messaging modules.
Fixed bug and disabled tests.