PR : Form # 13 Bugfix Mail View. Merged from Dubrovka