Strip spaces at end of header lines (Zarafa).
Removed workaround for old compiler.