diff --git a/conference.js b/conference.js
index 2c722bcf2..3ee6524d8 100644
--- a/conference.js
+++ b/conference.js
@@ -194,9 +194,8 @@ function maybeRedirectToWelcomePage(showThankYou) {
     }
 
     if (showThankYou) {
-        APP.UI.messageHandler.openMessageDialog(null, null,
-            APP.translation.generateTranslationHTML(
-                "dialog.thankYou", {appName:interfaceConfig.APP_NAME}));
+        APP.UI.messageHandler.openMessageDialog(
+            null, "dialog.thankYou", {appName:interfaceConfig.APP_NAME});
     }
 
     if (!config.enableWelcomePage) {
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 5b629b554..b461c1590 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -1051,7 +1051,7 @@ UI.updateDTMFSupport = function (isDTMFSupported) {
  * @returns {Promise} Resolved with value - false if the dialog is enabled and
  * resolved with true if the dialog is disabled or the feedback was already
  * submitted. Rejected if another dialog is already displayed. This values are
- * used to display or not display the thank you dialog from 
+ * used to display or not display the thank you dialog from
  * conference.maybeRedirectToWelcomePage method.
  */
 UI.requestFeedbackOnHangup = function () {
@@ -1207,9 +1207,8 @@ UI.getLargeVideo = function () {
 UI.showExtensionRequiredDialog = function (url) {
     messageHandler.openMessageDialog(
         "dialog.extensionRequired",
-        null,
-        APP.translation.generateTranslationHTML(
-            "dialog.firefoxExtensionPrompt", {url: url}));
+        "dialog.firefoxExtensionPrompt",
+        {url: url});
 };
 
 /**
@@ -1232,7 +1231,6 @@ UI.showExtensionExternalInstallationDialog = function (url) {
     messageHandler.openTwoButtonDialog({
         titleKey: 'dialog.externalInstallationTitle',
         msgKey: 'dialog.externalInstallationMsg',
-        msgString: '',
         leftButtonKey: 'dialog.goToStore',
         submitFunction,
         loadedFunction: $.noop,
@@ -1379,8 +1377,7 @@ UI.showTrackNotWorkingDialog = function (stream) {
     messageHandler.openMessageDialog(
         "dialog.error",
         stream.isAudioTrack()? "dialog.micNotSendingData" :
-            "dialog.cameraNotSendingData",
-        null);
+            "dialog.cameraNotSendingData");
 };
 
 UI.updateDevicesAvailability = function (id, devices) {
diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js
index dfe0fae81..114418a75 100644
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -29,23 +29,19 @@ var messageHandler = {
      *
      * @param titleKey the key used to find the translation of the title of the
      * message, if a message title is not provided.
-     * @param messageKey the key used to find the translation of the message,
-     * if a message is not provided.
-     * @param message the message to show. If a falsy value is provided,
-     * messageKey will be used to get a message via the translation API.
+     * @param messageKey the key used to find the translation of the message
+     * @param i18nOptions the i18n options (optional)
      * @param closeFunction function to be called after
      * the prompt is closed (optional)
      * @return the prompt that was created, or null
      */
-    openMessageDialog: function(titleKey, messageKey, message, closeFunction) {
+    openMessageDialog:
+        function(titleKey, messageKey, i18nOptions, closeFunction) {
         if (!popupEnabled)
             return null;
 
-        if (!message) {
-            message = APP.translation.generateTranslationHTML(messageKey);
-        }
-
-        let dialog = $.prompt(message, {
+        let dialog = $.prompt(
+            APP.translation.generateTranslationHTML(messageKey, i18nOptions), {
             title: this._getFormattedTitleString(titleKey),
             persistent: false,
             promptspeed: 0,
@@ -55,7 +51,7 @@ var messageHandler = {
                     closeFunction(e, v, m, f);
             }
         });
-        APP.translation.translateElement(dialog);
+        APP.translation.translateElement(dialog, i18nOptions);
         return dialog;
     },
     /**