ARQUIDEAS-1593 # Changes in mail template
ARQUIDEAS-1596 # Changes in mail template