diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
index 7269e1280f5..7bb69f508a8 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
@@ -80,6 +80,15 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
 
                 .beforeInside(BLOCK, FUN).spaceIf(jetCommonSettings.SPACE_BEFORE_METHOD_LBRACE)
 
+                .afterInside(LPAR, VALUE_PARAMETER_LIST).spaces(0)
+                .beforeInside(RPAR, VALUE_PARAMETER_LIST).spaces(0)
+                .afterInside(LT, TYPE_PARAMETER_LIST).spaces(0)
+                .beforeInside(GT, TYPE_PARAMETER_LIST).spaces(0)
+                .afterInside(LPAR, VALUE_ARGUMENT_LIST).spaces(0)
+                .beforeInside(RPAR, VALUE_ARGUMENT_LIST).spaces(0)
+                .afterInside(LT, TYPE_ARGUMENT_LIST).spaces(0)
+                .beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
+
                 // TODO: Ask for better API
                 // Type of the declaration colon
                 .beforeInside(COLON, PROPERTY).spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON)
diff --git a/idea/testData/formatter/UnnecessarySpacesInParametersLists.kt b/idea/testData/formatter/UnnecessarySpacesInParametersLists.kt
new file mode 100644
index 00000000000..43f70d70145
--- /dev/null
+++ b/idea/testData/formatter/UnnecessarySpacesInParametersLists.kt
@@ -0,0 +1,6 @@
+fun <   T > test( a: Int       ) = {(    a: Int    ) -> a }
+class Test<   T >
+
+fun foo(    ) {
+    test<    Int >(    12   )
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/UnnecessarySpacesInParametersLists_after.kt b/idea/testData/formatter/UnnecessarySpacesInParametersLists_after.kt
new file mode 100644
index 00000000000..7c6a18daa97
--- /dev/null
+++ b/idea/testData/formatter/UnnecessarySpacesInParametersLists_after.kt
@@ -0,0 +1,6 @@
+fun <T> test(a: Int) = {(a: Int) -> a }
+class Test<T>
+
+fun foo() {
+    test<Int>(12)
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java
index ee9fc756d9e..680920fedca 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java
@@ -116,6 +116,10 @@ public class JetFormatterTest extends AbstractJetFormatterTest {
         doTestWithInvert();
     }
 
+    public void testUnnecessarySpacesInParametersLists() throws Exception {
+        doTest();
+    }
+
     public void testWhen() throws Exception {
         doTest();
     }