diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java
index 8d724eaf013b..5b5dcd549051 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntention.java
@@ -22,6 +22,9 @@ import com.siyeh.ipp.base.Intention;
 import com.siyeh.ipp.base.PsiElementPredicate;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class JoinConcatenatedStringLiteralsIntention extends Intention {
 
   @Override
@@ -40,34 +43,48 @@ public class JoinConcatenatedStringLiteralsIntention extends Intention {
     }
     final PsiJavaToken token = (PsiJavaToken)element;
     final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)element.getParent();
-    final PsiExpression[] operands = polyadicExpression.getOperands();
     StringBuilder newExpression = new StringBuilder();
-    PsiExpression previous = null;
-    for (PsiExpression operand : operands) {
-      if (newExpression.length() != 0 && previous != null) {
-        newExpression.append('+');
+    final PsiElement[] children = polyadicExpression.getChildren();
+    final List<PsiElement> buffer = new ArrayList(3);
+    for (PsiElement child : children) {
+      if (child instanceof PsiJavaToken) {
+        if (token.equals(child)) {
+          final PsiLiteralExpression literalExpression = (PsiLiteralExpression)buffer.get(0);
+          final Object value = literalExpression.getValue();
+          assert value != null;
+          newExpression.append('"').append(StringUtil.escapeStringCharacters(value.toString()));
+        }
+        else {
+          for (PsiElement bufferedElement : buffer) {
+            newExpression.append(bufferedElement.getText());
+          }
+          buffer.clear();
+          newExpression.append(child.getText());
+        }
       }
-      final PsiJavaToken currentToken = polyadicExpression.getTokenBeforeOperand(operand);
-      if (token == currentToken) {
-        final PsiLiteralExpression literal1 = (PsiLiteralExpression)previous;
-        assert literal1 != null;
-        final PsiLiteralExpression literal2 = (PsiLiteralExpression)operand;
-        final Object value1 = literal1.getValue();
-        final Object value2 = literal2.getValue();
-        assert value1 != null && value2 != null;
-        final String text1 = StringUtil.escapeStringCharacters(value1.toString());
-        final String text2 = StringUtil.escapeStringCharacters(value2.toString());
-        newExpression.append('"').append(text1).append(text2).append('"');
-        previous = null;
-      } else {
-        if (previous != null) {
-          newExpression.append(previous.getText());
+      else if (child instanceof PsiLiteralExpression) {
+        if (buffer.isEmpty()) {
+          buffer.add(child);
+        }
+        else {
+          final PsiLiteralExpression literalExpression = (PsiLiteralExpression)child;
+          final Object value = literalExpression.getValue();
+          assert value != null;
+          newExpression.append(StringUtil.escapeStringCharacters(value.toString())).append('"');
+          buffer.clear();
+        }
+      }
+      else {
+        if (buffer.isEmpty()) {
+          newExpression.append(child.getText());
+        }
+        else {
+          buffer.add(child);
         }
-        previous = operand;
       }
     }
-    if (previous != null) {
-      newExpression.append('+').append(previous.getText());
+    for (PsiElement bufferedElement : buffer) {
+      newExpression.append(bufferedElement.getText());
     }
     replaceExpression(newExpression.toString(), polyadicExpression);
   }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace.java
new file mode 100644
index 000000000000..874ce65ceeb1
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace.java
@@ -0,0 +1,12 @@
+class KeepCommentsAndWhitespace {
+  static {
+    System.out.println("select foo_id, bar, baz "+
+                       "from foo f "+
+                       "where bar=1 "+
+                       "  and baz=2 " <caret>+
+                       "  and gazonk < ("+ // comment
+                       "        select count(distinct feeble) " +
+                       "        from dribble "+
+                       "        where zabble = f.bar)");
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace_after.java
new file mode 100644
index 000000000000..1622f5eded8e
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/join_concat/KeepCommentsAndWhitespace_after.java
@@ -0,0 +1,11 @@
+class KeepCommentsAndWhitespace {
+  static {
+    System.out.println("select foo_id, bar, baz " +
+            "from foo f " +
+            "where bar=1 " +
+            "  and baz=2   and gazonk < (" + // comment
+            "        select count(distinct feeble) " +
+            "        from dribble " +
+            "        where zabble = f.bar)");
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntentionTest.java
index 769c1ed24042..ca3dd1a368d5 100644
--- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntentionTest.java
+++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntentionTest.java
@@ -9,6 +9,7 @@ public class JoinConcatenatedStringLiteralsIntentionTest extends IPPTestCase {
     public void testNonString() { doTest(); }
     public void testNonString2() { doTest(); }
     public void testNotAvailable() { assertIntentionNotAvailable(); }
+    public void testKeepCommentsAndWhitespace() { doTest(); }
 
     @Override
     protected String getIntentionName() {