Emailer fixes

Some adaption of the emailer to the new objects.
Could not test the actual email deployment, but at
least there are no syntactical errors any longer.