diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
index e6854c14..4bfe1d23 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
@@ -33,18 +33,15 @@ import java.util.Locale;
  */
 public class LanguagePlugin implements Plugin {
 
-    private Locale[] locales;
-    private JMenu languageMenu;
-
     @Override
 	public void initialize() {
         // Register with action menu
         final JMenu actionsMenu = SparkManager.getMainWindow().getMenuByName(Res.getString("menuitem.actions"));
 
-        languageMenu = new JMenu(Res.getString("menuitem.languages"));
+        JMenu languageMenu = new JMenu(Res.getString("menuitem.languages"));
         languageMenu.setIcon(SparkRes.getImageIcon("LANGUAGE_ICON"));
 
-        locales = Locale.getAvailableLocales();
+        Locale[] locales = Locale.getAvailableLocales();
 
         // Load files
         for (final Locale locale : locales) {
@@ -57,14 +54,14 @@ public class LanguagePlugin implements Plugin {
 
             // If we can find an translation file for this locale, we can support the language!
             if (getClass().getResource( targetI18nFileName ) != null) {
-                addLanguage(locale);
+                addLanguage(locale, languageMenu);
             }
         }
 
         actionsMenu.add(languageMenu);
     }
 
-    private void addLanguage(Locale locale) {
+    private void addLanguage(Locale locale, JMenu languageMenu) {
         Action action = new AbstractAction() {
             private static final long serialVersionUID = -7093236616888591766L;