t807 - fix for email wrappers message if uniform is present.