Even more tweaks to e-mail plugin.. almost there..!