hm, I'm not sure, because it's possible for `Threads.active` and `MessageManager.draft` to both be true, I think, so we always want to delete MessageManager.draft in discardDraft regardless of the nature of the thread.  But I see what you are saying, the conditional might not be exactly what we need.  I have a meeting very soon 2-3pm so I need to come back to it.