Fix last change to message-exchange-point-and-mark. * message.el (message-exchange-point-and-mark): Rework last change to avoid using optional arg of exchange-point-and-mark, for backward compatibility.