diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index 7c1a09f6cff3..0f56a18d2f7c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -126,6 +126,9 @@ public class CommitMessage extends AbstractDataProviderPanel implements Disposab
       features.add(new RightMarginEditorFeature(false, -1));
     }
 
+    features.add(new SoftWrapsEditorFeature(true));
+    features.add(new AdditionalPageAtBottomEditorFeature(false));
+
     EditorTextFieldProvider service = ServiceManager.getService(project, EditorTextFieldProvider.class);
     return service.getEditorField(FileTypes.PLAIN_TEXT.getLanguage(), project, features);
   }