diff --git a/plone/app/discussion/browser/migration.py b/plone/app/discussion/browser/migration.py
index 5031654..2910092 100644
--- a/plone/app/discussion/browser/migration.py
+++ b/plone/app/discussion/browser/migration.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from Acquisition import aq_inner, aq_parent
 
 from Products.Five.browser import BrowserView
@@ -49,9 +51,11 @@ class View(BrowserView):
                 comment.title = reply.Title()
                 comment.text = reply.text
                 comment.creator = reply.Creator()
-                #comment.author_name = author_username
-                #comment.author_email = ""
-                #comment.creation_date
+
+                #comment.creation_date = datetime.fromtimestamp(reply.creation_date)
+
+                comment.creation_date = datetime.fromtimestamp(reply.creation_date)
+                comment.modification_date = datetime.fromtimestamp(reply.modification_date)
 
                 comment.reply_to = in_reply_to
 
diff --git a/plone/app/discussion/tests/test_migration.py b/plone/app/discussion/tests/test_migration.py
index 6de1450..f291e48 100644
--- a/plone/app/discussion/tests/test_migration.py
+++ b/plone/app/discussion/tests/test_migration.py
@@ -1,3 +1,6 @@
+from datetime import datetime
+from DateTime import DateTime
+
 import unittest
 
 from zope.annotation.interfaces import IAnnotations
@@ -40,6 +43,8 @@ class MigrationTest(PloneTestCase):
         #reply = talkback.objectValues()[0]
         reply = talkback.getReplies()[0]
         reply.setReplyTo(self.doc)
+        reply.creation_date = DateTime(2003, 3, 11, 9, 28, 6)
+        reply.modification_date = DateTime(2009, 7, 12, 19, 38, 7)
         self.assertEquals(reply.Title(), 'My Title')
         self.assertEquals(reply.EditableBody(), 'My Text')
         self.failUnless('Jim' in reply.listCreators())
@@ -62,6 +67,8 @@ class MigrationTest(PloneTestCase):
         self.assertEquals(comment1.Title(), 'My Title')
         self.assertEquals(comment1.text, 'My Text')
         self.assertEquals(comment1.Creator(), 'Jim')
+        self.assertEquals(comment1.creation_date, datetime(2003, 3, 11, 9, 28, 6))
+        self.assertEquals(comment1.modification_date, datetime(2009, 7, 12, 19, 38, 7))
         self.assertEquals(
             [{'comment': comment1,     'depth': 0, 'id': long(comment1.id)},]
             , list(conversation.getThreads()))