updated mail formats for bug 698