improve TMail compatibility