Add draft support

The emails collection doesn't process emails marked as drafts and correctly handles sending them after they've been marked as 'not a draft'
Relocate comment block