Fixed large parts of e-mail plug-in.