Changed to preserve message ID