fixes for inbox and drafts