Added some customization to message and subject fields, it still needs to be improved