refactor addMessageToConversationwithReceivedMessage and addMessageToConversationWithReceivedMessageArray
resolve conflict with master
add the missing jump when the user finishes the login steps