fix #5: moved email to/from at top level