Fixed bugs that are related to sending and receiving messages to different
addresses