diff --git a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
index 527bb2a8..9ce7abf8 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
@@ -16,6 +16,8 @@ import java.awt.Font
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
 
+import static com.muwire.gui.Translator.trans
+
 @ArtifactProviderFor(GriffonController)
 class OptionsController {
     @MVCMember @Nonnull
@@ -260,7 +262,7 @@ class OptionsController {
     void downloadLocation() {
         def chooser = new JFileChooser()
         chooser.setFileHidingEnabled(false)
-        chooser.setDialogTitle("Select location for downloaded files")
+        chooser.setDialogTitle(trans("OPTIONS_SELECT_LOCATION_DOWNLOADED_FILES"))
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY)
         int rv = chooser.showOpenDialog(null)
         if (rv == JFileChooser.APPROVE_OPTION)
@@ -271,7 +273,7 @@ class OptionsController {
     void incompleteLocation() {
         def chooser = new JFileChooser()
         chooser.setFileHidingEnabled(false)
-        chooser.setDialogTitle("Select location for downloaded files")
+        chooser.setDialogTitle(trans("OPTIONS_SELECT_LOCATION_INCOMPLETE_FILES"))
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY)
         int rv = chooser.showOpenDialog(null)
         if (rv == JFileChooser.APPROVE_OPTION)
@@ -283,12 +285,12 @@ class OptionsController {
         def chooser = new JFileChooser()
         chooser.with { 
             setFileHidingEnabled(false)
-            setDialogTitle("Select location of chat server welcome file")
+            setDialogTitle(trans("OPTIONS_SELECT_CHAT_SERVER_FILE"))
             setFileSelectionMode(JFileChooser.FILES_ONLY)
-            int rv = chooser.showOpenDialog(null)
-            if (rv == JFileChooser.APPROVE_OPTION)
-                model.chatWelcomeFile = getSelectedFile().getAbsolutePath()
         }
+        int rv = chooser.showOpenDialog(null)
+        if (rv == JFileChooser.APPROVE_OPTION)
+            model.chatWelcomeFile = getSelectedFile().getAbsolutePath()
     }
     
     @ControllerAction
@@ -328,6 +330,6 @@ class OptionsController {
     void clearHistory() {
         uiSettings.searchHistory.clear()
         saveUISettings()
-        JOptionPane.showMessageDialog(null, "Search history has been cleared")
+        JOptionPane.showMessageDialog(null, trans("OPTIONS_SEARCH_HISTORY_CLEARED"))
     }
 }
\ No newline at end of file
diff --git a/gui/griffon-app/i18n/messages.properties b/gui/griffon-app/i18n/messages.properties
index eb01853c..6472c4b7 100644
--- a/gui/griffon-app/i18n/messages.properties
+++ b/gui/griffon-app/i18n/messages.properties
@@ -330,6 +330,12 @@ OPTIONS_ADVERTISE_CHAT=Advertise chat ability in search results
 OPTIONS_MAX_CHAT_SCROLLBACK=Maximum lines of scrollback (-1 means unlimited)
 OPTIONS_CHAT_WELCOME_FILE=Welcome message file
 
+# Dialogs
+OPTIONS_SELECT_LOCATION_DOWNLOADED_FILES=Select location for downloaded files
+OPTIONS_SELECT_LOCATION_INCOMPLETE_FILES=Select location for incomplete files
+OPTIONS_SELECT_CHAT_SERVER_FILE=Select chat server welcome text file
+OPTIONS_SEARCH_HISTORY_CLEARED=Search history has been cleared
+
 # Buttons panel
 SAVE=Save