minor tweaks for full backwards compatibility with Email Templates extension. #1810