Add MUX mail composition.
Fixing the -/-- commands.