A bit of menu cleanup, and allow mail from any from address (to support Webform generated emails.)

Signed-off-by: Shai Sachs <ssachs@ngpvan.com>