Simplify patch code using DefaultCheckoff
Swap Waiting and Inboxes (Waiting is special)
Show 'due' before 'new'