Adding locations to messages