email-server: reorder, small tweaks