bug fixes: drafts & attachments