Refinements of last commit
Working on getting client notified of message undo before round-trip

Waiting to synchronize with server is too slow; this partial work is
to get the client notified that the message has returned to the folder
before we have actually synchronized with the server.