REFACTORED: message receiver to be more read-able

In order to show key exchanges messages in the message list they must be saved on receive and on sent. This refactor is to help with the process to allow for fixes to be applied easier to message receiver.