Fix issue with extra controls showing up in inbox and outbox