FIX: subject is None

@mluessi this should to the job.