[MERGE] [FIX] email_template: effectively support 'user signature'