diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
index cf6d5ff088..775fa4a9b8 100644
--- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
@@ -409,7 +409,7 @@ public:
         getLastText() = userText.getText();
         resultText.setText (CodeHelpers::stringLiteral (getLastText()), false);
     }
-    
+
     void resized()
     {
         desc.setBounds (8, 8, getWidth() - 16, 44);
diff --git a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
index 450a2da4d4..0f50809b4f 100644
--- a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
@@ -93,26 +93,15 @@ void StoredSettings::reload()
         // These settings are used in defining the properties file's location.
         PropertiesFile::Options options;
         options.applicationName     = "Introjucer";
-        options.folderName          = "Introjucer";
         options.filenameSuffix      = "settings";
         options.osxLibrarySubFolder = "Application Support";
+       #if JUCE_LINUX
+        options.folderName          = ".introjucer";
+       #else
+        options.folderName          = "Introjucer";
+       #endif
 
         props = new PropertiesFile (options);
-
-        // Because older versions of the introjucer saved their settings under a different
-        // name, this code is an example of how to migrate your old settings files...
-        if (! props->getFile().exists())
-        {
-            PropertiesFile::Options oldOptions;
-            oldOptions.applicationName      = "Jucer2";
-            oldOptions.filenameSuffix       = "settings";
-            oldOptions.osxLibrarySubFolder  = "Preferences";
-
-            PropertiesFile oldProps (oldOptions);
-
-            if (oldProps.getFile().exists())
-                props->addAllPropertiesFrom (oldProps);
-        }
     }
 
     // recent files...
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.h b/modules/juce_gui_basics/widgets/juce_TextEditor.h
index 0603a04b93..1facd9d973 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.h
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.h
@@ -343,7 +343,7 @@ public:
     /** Returns a Value object that can be used to get or set the text.
 
         Bear in mind that this operate quite slowly if your text box contains large
-        amounts of text, as it needs to dynamically build the string that's involved. 
+        amounts of text, as it needs to dynamically build the string that's involved.
         It's best used for small text boxes.
     */
     Value& getTextValue();