[PATCH] emacs: Re-arrange message sending code