Make Mms more compatible with Themes

Change-Id: Ie7761ee683c91a2537febf0bc2d53be8b679247c
Credit: kroz (https://github.com/kroz)