Pull request --- Moved email templates to right folder --- enhanced code --- fixed dr...

...upal_set_message parameter bug