diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java
index ccd047d2c5c..1c620a48bbf 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java
@@ -99,7 +99,7 @@ public abstract class AbstractJetUpDownMover extends LineMover {
         return sourceRange;
     }
 
-    private static int getElementLineCount(PsiElement element, Editor editor) {
+    protected static int getElementLineCount(PsiElement element, Editor editor) {
         Document doc = editor.getDocument();
         TextRange spaceRange = element.getTextRange();
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
index 8572073b3b0..8645f8a801a 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
@@ -400,13 +400,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
         }
 
         if (whiteSpaceTestSubject instanceof PsiWhiteSpace) {
-            Document doc = editor.getDocument();
-            TextRange spaceRange = whiteSpaceTestSubject.getTextRange();
-
-            int startLine = doc.getLineNumber(spaceRange.getStartOffset());
-            int endLine = doc.getLineNumber(spaceRange.getEndOffset());
-
-            if (endLine - startLine > 1) {
+            if (getElementLineCount(whiteSpaceTestSubject, editor) > 1) {
                 int nearLine = down ? sourceRange.endLine : sourceRange.startLine - 1;
 
                 info.toMove = sourceRange;