Include correct deadline in mails