Clean messages a bit up and added a envolope