Move email to observer