improving mms compatibility