Added hack to avoid bug #3036 on badly encodied mails