diff --git a/openapi/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/openapi/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index 266a7b32ed1f..245123fa1502 100644
--- a/openapi/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/openapi/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -54,6 +54,7 @@ public class CommitMessage extends JPanel{
               setText(contentChooser.getAllContents().get(selectedIndex));
             }
           }
+          myCommentArea.requestFocus();
         }
       });
     }
diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/CalendarView.java b/openapi/src/com/intellij/util/ui/CalendarView.java
similarity index 98%
rename from plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/CalendarView.java
rename to openapi/src/com/intellij/util/ui/CalendarView.java
index 8fcf48172133..b2f5ee4aa14b 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/CalendarView.java
+++ b/openapi/src/com/intellij/util/ui/CalendarView.java
@@ -1,4 +1,4 @@
-package com.intellij.cvsSupport2.cvsoperations.dateOrRevision.ui;
+package com.intellij.util.ui;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/IntegerSpinnerModel.java b/openapi/src/com/intellij/util/ui/IntegerSpinnerModel.java
similarity index 93%
rename from plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/IntegerSpinnerModel.java
rename to openapi/src/com/intellij/util/ui/IntegerSpinnerModel.java
index b458cb6eecdd..1ff17e769ff2 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/IntegerSpinnerModel.java
+++ b/openapi/src/com/intellij/util/ui/IntegerSpinnerModel.java
@@ -1,10 +1,8 @@
-package com.intellij.cvsSupport2.cvsoperations.dateOrRevision.ui;
+package com.intellij.util.ui;
 
 import javax.swing.*;
 
-/**
- * author: lesya
- */
+
 
 class IntegerSpinnerModel extends AbstractSpinnerModel {
   private final int myMinValue;
diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/SelectDateDialog.form b/openapi/src/com/intellij/util/ui/SelectDateDialog.form
similarity index 82%
rename from plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/SelectDateDialog.form
rename to openapi/src/com/intellij/util/ui/SelectDateDialog.form
index 69187f658dc5..131c74d0bdd7 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/SelectDateDialog.form
+++ b/openapi/src/com/intellij/util/ui/SelectDateDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.cvsSupport2.cvsoperations.dateOrRevision.ui.SelectDateDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.util.ui.SelectDateDialog">
   <grid id="2a032" binding="myPanel" row-count="2" column-count="1" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -9,7 +9,7 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="5dbd6" class="com.intellij.cvsSupport2.cvsoperations.dateOrRevision.ui.CalendarView" binding="myCalendarView">
+      <component id="5dbd6" class="com.intellij.util.ui.CalendarView" binding="myCalendarView">
         <constraints>
           <xy x="0" y="0" width="185" height="66"/>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
diff --git a/openapi/src/com/intellij/util/ui/SelectDateDialog.java b/openapi/src/com/intellij/util/ui/SelectDateDialog.java
new file mode 100644
index 000000000000..97ddd294548a
--- /dev/null
+++ b/openapi/src/com/intellij/util/ui/SelectDateDialog.java
@@ -0,0 +1,32 @@
+package com.intellij.util.ui;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+
+import javax.swing.*;
+import java.util.Date;
+
+
+public class SelectDateDialog extends DialogWrapper {
+  private CalendarView myCalendarView;
+  private JPanel myPanel;
+
+  public SelectDateDialog(Project project) {
+    super(project, true);
+    init();
+    setTitle("Choose Date");
+    pack();
+  }
+
+  protected JComponent createCenterPanel() {
+    return myPanel;
+  }
+
+  public Date getDate() {
+    return myCalendarView.getDate();
+  }
+
+  public void setDate(Date date) {
+    myCalendarView.setDate(date);
+  }
+}
diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java
index 5ba61f8800a5..cee06ad9165c 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java
+++ b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java
@@ -5,6 +5,7 @@ import com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.TagsHelper;
 import com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.TagsProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import com.intellij.util.ui.SelectDateDialog;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;