fixing emailer default behaviour