diff --git modules/comment/comment.module modules/comment/comment.module
index cd659f0..c48c76e 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -1910,7 +1910,7 @@ function comment_form($form, &$form_state, $comment) {
   if ($is_admin) {
     $author = (!$comment->uid && $comment->name ? $comment->name : $comment->registered_name);
     $status = (isset($comment->status) ? $comment->status : COMMENT_NOT_PUBLISHED);
-    $date = (!empty($comment->date) ? $comment->date : format_date($comment->changed, 'custom', 'Y-m-d H:i O'));
+    $date = (!empty($comment->created) ? format_date($comment->created, 'custom', 'Y-m-d H:i O') : format_date($comment->changed, 'custom', 'Y-m-d H:i O'));
   }
   else {
     if ($user->uid) {
diff --git modules/comment/comment.test modules/comment/comment.test
index cf1f026..a02ec9d 100644
--- modules/comment/comment.test
+++ modules/comment/comment.test
@@ -522,6 +522,7 @@ class CommentPreviewTest extends CommentHelperCase {
    * Test comment edit and preview.
    */
   function testCommentEditPreview() {
+    variable_set('date_default_timezone', 'UTC');
     $langcode = LANGUAGE_NONE;
     $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'skip comment approval'));
     $this->drupalLogin($this->admin_user);
@@ -534,8 +535,8 @@ class CommentPreviewTest extends CommentHelperCase {
     $edit['subject'] = $this->randomName(8);
     $edit['comment_body[' . $langcode . '][0][value]'] = $this->randomName(16);
     $edit['name'] = $web_user->name;
-    $edit['date'] = '2008-03-02 17:23 +0300';
-    $expected_date = format_date(strtotime($edit['date']));
+    $edit['date'] = '2008-03-02 17:23 +0000';
+    $expected_date = format_date(strtotime($edit['date']), 'medium', '', 'UTC');
     $comment = $this->postComment($this->node, $edit['subject'], $edit['comment_body[' . $langcode . '][0][value]'], TRUE);
     $this->drupalPost('comment/' . $comment->id . '/edit', $edit, t('Preview'));