Fix messaging for Firefox 34+