Minor refactoring and formatting
Changes the espaces a bit

It is now tried to escape the messages during the creation of the Query,
not during the sending process. Not workign yet though