More email message cleanup