Doesn't need to go via the MessageModel anymore
Message model isn't needed anymore as we don't connect GMail at this stage anymore