Fixed emailer problems