Broke out arguments into separate header, added hostname to subject.