Better performance of mail viewer #327