Fix double-headers in outbox