Bug 936157 - [Messages] Bug 928821 breaks the desktop mock r=schung