diff --git a/Changelog.md b/Changelog.md
index 706feb1c1c5..b064bc24e30 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## 1.1
 
 ## 1.0.2
+- Show only changed files in notification "Kotlin not configured"
 
 ### JVM
 - Remove the compiler option "Xmultifile-facades-open"
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
index cf98cd79157..043e50929e0 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
@@ -59,20 +59,19 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi
     }
 
     @Override
-    protected void addSourceSetsBlock(@NotNull GroovyFile file) {
+    protected boolean addSourceSetsBlock(@NotNull GroovyFile file) {
         GrClosableBlock androidBlock = getAndroidBlock(file);
-        addLastExpressionInBlockIfNeeded(SOURCE_SET, getSourceSetsBlock(androidBlock));
+        return addLastExpressionInBlockIfNeeded(SOURCE_SET, getSourceSetsBlock(androidBlock));
     }
 
     @Override
     protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
         if (isTopLevelProjectFile) {
-            addElementsToProjectFile(groovyFile, version);
+            return addElementsToProjectFile(groovyFile, version);
         }
         else {
-            addElementsToModuleFile(groovyFile, version);
+            return addElementsToModuleFile(groovyFile, version);
         }
-        return true;
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
index 719524bdedc..1a18c4f86ee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
@@ -59,17 +59,17 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator
     }
 
     @Override
-    protected void addSourceSetsBlock(@NotNull GroovyFile file) {
+    protected boolean addSourceSetsBlock(@NotNull GroovyFile file) {
         GrClosableBlock sourceSetBlock = getSourceSetsBlock(file);
-        addLastExpressionInBlockIfNeeded(SOURCE_SET, sourceSetBlock);
+        return addLastExpressionInBlockIfNeeded(SOURCE_SET, sourceSetBlock);
     }
 
     @Override
     protected boolean addElementsToFile(@NotNull GroovyFile groovyFile, boolean isTopLevelProjectFile, @NotNull String version) {
         if (!isTopLevelProjectFile) {
-            addElementsToProjectFile(groovyFile, version);
-            addElementsToModuleFile(groovyFile, version);
-            return true;
+            boolean wasModified = addElementsToProjectFile(groovyFile, version);
+            wasModified |= addElementsToModuleFile(groovyFile, version);
+            return wasModified;
         }
         return false;
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
index bf0bf06db36..1343438e832 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.DependencyScope;
 import com.intellij.openapi.roots.ExternalLibraryDescriptor;
+import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -198,33 +199,41 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
         return null;
     }
 
-    protected static void addElementsToProjectFile(@NotNull GroovyFile file, @NotNull String version) {
+    protected static boolean addElementsToProjectFile(@NotNull GroovyFile file, @NotNull String version) {
+        boolean wasModified;
+
         GrClosableBlock buildScriptBlock = getBuildScriptBlock(file);
-        addFirstExpressionInBlockIfNeeded(VERSION.replace(VERSION_TEMPLATE, version), buildScriptBlock);
+        wasModified = addFirstExpressionInBlockIfNeeded(VERSION.replace(VERSION_TEMPLATE, version), buildScriptBlock);
 
         GrClosableBlock buildScriptRepositoriesBlock = getBuildScriptRepositoriesBlock(file);
         if (isSnapshot(version)) {
-            addLastExpressionInBlockIfNeeded(SNAPSHOT_REPOSITORY, buildScriptRepositoriesBlock);
+            wasModified |= addLastExpressionInBlockIfNeeded(SNAPSHOT_REPOSITORY, buildScriptRepositoriesBlock);
         }
         else if (!isRepositoryConfigured(buildScriptRepositoriesBlock)) {
-            addLastExpressionInBlockIfNeeded(MAVEN_CENTRAL, buildScriptRepositoriesBlock);
+            wasModified |= addLastExpressionInBlockIfNeeded(MAVEN_CENTRAL, buildScriptRepositoriesBlock);
         }
 
         GrClosableBlock buildScriptDependenciesBlock = getBuildScriptDependenciesBlock(file);
-        addLastExpressionInBlockIfNeeded(CLASSPATH, buildScriptDependenciesBlock);
+        wasModified |= addLastExpressionInBlockIfNeeded(CLASSPATH, buildScriptDependenciesBlock);
+
+        return wasModified;
     }
 
-    protected void addElementsToModuleFile(@NotNull GroovyFile file, @NotNull String version) {
+    protected boolean addElementsToModuleFile(@NotNull GroovyFile file, @NotNull String version) {
+        boolean wasModified = false;
+
         if (!file.getText().contains(getApplyPluginDirective())) {
             GrExpression apply = GroovyPsiElementFactory.getInstance(file.getProject()).createExpressionFromText(getApplyPluginDirective());
             GrApplicationStatement applyStatement = getApplyStatement(file);
             if (applyStatement != null) {
                 file.addAfter(apply, applyStatement);
+                wasModified = true;
             }
             else {
                 GrClosableBlock buildScript = getBlockByName(file, "buildscript");
                 if (buildScript != null) {
                     file.addAfter(apply, buildScript.getParent());
+                    wasModified = true;
                 }
                 else {
                     GrStatement[] statements = file.getStatements();
@@ -234,22 +243,26 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
                     else {
                         file.addAfter(apply, file.getFirstChild());
                     }
+                    wasModified = true;
                 }
             }
         }
 
         GrClosableBlock repositoriesBlock = getRepositoriesBlock(file);
         if (isSnapshot(version)) {
-            addLastExpressionInBlockIfNeeded(SNAPSHOT_REPOSITORY, repositoriesBlock);
+            wasModified |= addLastExpressionInBlockIfNeeded(SNAPSHOT_REPOSITORY, repositoriesBlock);
         }
         else if (!isRepositoryConfigured(repositoriesBlock)) {
-            addLastExpressionInBlockIfNeeded(MAVEN_CENTRAL, repositoriesBlock);
+            wasModified |= addLastExpressionInBlockIfNeeded(MAVEN_CENTRAL, repositoriesBlock);
         }
 
         GrClosableBlock dependenciesBlock = getDependenciesBlock(file);
-        addLastExpressionInBlockIfNeeded(LIBRARY, dependenciesBlock);
+        Module module = FileIndexFacade.getInstance(file.getProject()).getModuleForFile(file.getVirtualFile());
+        wasModified |= addExpressionInBlockIfNeeded(LIBRARY, dependenciesBlock, false, !ConfigureKotlinInProjectUtilsKt.hasKotlinRuntimeInScope(module));
 
-        addSourceSetsBlock(file);
+        wasModified |= addSourceSetsBlock(file);
+
+        return wasModified;
     }
 
     private static boolean isRepositoryConfigured(GrClosableBlock repositoriesBlock) {
@@ -258,7 +271,7 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
 
     protected abstract String getApplyPluginDirective();
 
-    protected abstract void addSourceSetsBlock(@NotNull GroovyFile file);
+    protected abstract boolean addSourceSetsBlock(@NotNull GroovyFile file);
 
     protected abstract boolean addElementsToFile(
             @NotNull GroovyFile groovyFile,
@@ -312,7 +325,7 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
         }.execute();
 
         VirtualFile virtualFile = groovyFile.getVirtualFile();
-        if (virtualFile != null) {
+        if (virtualFile != null && isModified[0]) {
             collector.addMessage(virtualFile.getPath() + " was modified");
         }
         return isModified[0];
@@ -369,12 +382,12 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
         return block;
     }
 
-    protected static void addLastExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block) {
-        addExpressionInBlockIfNeeded(text, block, false);
+    protected static boolean addLastExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block) {
+        return addExpressionInBlockIfNeeded(text, block, false, false);
     }
 
-    private static void addFirstExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block) {
-        addExpressionInBlockIfNeeded(text, block, true);
+    private static boolean addFirstExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block) {
+        return addExpressionInBlockIfNeeded(text, block, true, false);
     }
 
     @Nullable
@@ -392,8 +405,8 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
         return null;
     }
 
-    private static void addExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block, boolean isFirst) {
-        if (block.getText().contains(text)) return;
+    private static boolean addExpressionInBlockIfNeeded(@NotNull String text, @NotNull GrClosableBlock block, boolean isFirst, boolean forceInsert) {
+        if (!forceInsert && block.getText().contains(text)) return false;
         GrExpression newStatement = GroovyPsiElementFactory.getInstance(block.getProject()).createExpressionFromText(text);
         CodeStyleManager.getInstance(block.getProject()).reformat(newStatement);
         GrStatement[] statements = block.getStatements();
@@ -409,6 +422,7 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
                 block.addAfter(newStatement, firstChild);
             }
         }
+        return true;
     }
 
     @Nullable