Fixed bug regarding ' in the sender/receiver names