Fix draft resuming
Move discard actions into popup menu
Better generation of message popup menu