Fix a merge error in message outbox