[MERGE] Fixes some posting/email_template issues. Also cleans an old hack about res...