diff --git a/plone/app/discussion/__init__.py b/plone/app/discussion/__init__.py
index dbed15e..2e973d9 100644
--- a/plone/app/discussion/__init__.py
+++ b/plone/app/discussion/__init__.py
@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+
+from zope.i18nmessageid import MessageFactory
+PloneAppDiscussionMessageFactory = MessageFactory('plone.app.discussion')
+
 # Monkey patch plone.app.vocabularies.types.BAD_TYPES and remove
 # 'Discussion Item' from this tuple, so that Comments can be found
 # in the search. This will become needless once plone.app.discussion
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index e2494fb..ba002c3 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -22,7 +22,7 @@ from plone.registry.interfaces import IRegistry
 
 from plone.app.layout.viewlets.common import ViewletBase
 
-from plone.app.discussion.interfaces import _
+from plone.app.discussion import PloneAppDiscussionMessageFactory as _
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IComment
 from plone.app.discussion.interfaces import IReplies
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index ffc4142..3da1569 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -2,9 +2,7 @@ from zope.interface import Interface
 from zope.interface.common.mapping import IIterableMapping
 from zope import schema
 
-from zope.i18nmessageid import MessageFactory
-
-_ = MessageFactory('plone.app.discussion')
+from plone.app.discussion import PloneAppDiscussionMessageFactory as _
 
 
 class IDiscussionSettings(Interface):
@@ -34,7 +32,8 @@ class IDiscussionSettings(Interface):
                            default=True)
 
     anonymous_comments = schema.Bool(
-                             title=_(u"Enable anonymous comments"),
+                             title=_(u"label_anonymous_comments", 
+                                     default="Enable anonymous comments"),
                              description=_(u"help_anonymous_comments",
                                            default=u"If selected, anonymous "
                                                     "users are able to post "
@@ -48,7 +47,7 @@ class IDiscussionSettings(Interface):
                              default=False)
 
     captcha = schema.Choice(
-                  title=_(u"Captcha"),
+                  title=_(u"label_captcha", default="Captcha"),
                   description=_(u"help_captcha",
                                 default=u"Use this setting to enable or "
                                          "disable Captcha validation for "
@@ -61,7 +60,8 @@ class IDiscussionSettings(Interface):
                    vocabulary='plone.app.discussion.vocabularies.CaptchaVocabulary',)
 
     show_commenter_image = schema.Bool(
-                               title=_(u"Show commenter image"),
+                               title=_(u"label_show_commenter_image",
+                                       default=u"Show commenter image"),
                                description=_(u"help_show_commenter_image",
                                              default=u"If selected, an image "
                                                        "of the user is shown "
@@ -71,7 +71,7 @@ class IDiscussionSettings(Interface):
 
     moderator_notification_enabled = schema.Bool(
                                          title=_(u"label_moderator_notification_enabled",
-                                         default=u"Enable moderator email notification"),
+                                                 default=u"Enable moderator email notification"),
                                          description=_(u"help_moderator_notification_enabled",
                                                        default=u"If selected, "
                                                                 "the moderator "
@@ -235,10 +235,12 @@ class IComment(Interface):
     author_name = schema.TextLine(title=_(u"Name"), required=False)
     author_email = schema.TextLine(title=_(u"Email"), required=False)
     
-    title = schema.TextLine(title=_(u"Subject"))
+    title = schema.TextLine(title=_(u"label_subject", 
+                                    default=u"Subject"))
 
     mime_type = schema.ASCIILine(title=_(u"MIME type"), default="text/plain")
-    text = schema.Text(title=_(u"Comment"))
+    text = schema.Text(title=_(u"label_comment", 
+                               default=u"Comment"))
 
     #author_notification = schema.Bool(title=_(u"Notify me of new comments via "
     #                                         "email."),