diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
index 6519ddae7..3ab95b471 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -1,15 +1,17 @@
 import extractMentionedUsers from './notifications/extractMentionedUsers'
 import extractHashtags from './hashtags/extractHashtags'
 
-const notify = async (postId, idsOfMentionedUsers, context) => {
+const notifyMentionOfPost = async (postId, idsOfMentionedUsers, context) => {
+  if (!idsOfMentionedUsers.length) return
+
   const session = context.driver.session()
   const createdAt = new Date().toISOString()
   const cypher = `
-    match(u:User) where u.id in $idsOfMentionedUsers
-    match(p:Post) where p.id = $postId
-    create(n:Notification{id: apoc.create.uuid(), read: false, createdAt: $createdAt})
-    merge (n)-[:NOTIFIED]->(u)
-    merge (p)-[:NOTIFIED]->(n)
+    MATCH (u: User) WHERE u.id in $idsOfMentionedUsers
+    MATCH (p: Post) WHERE p.id = $postId
+    CREATE (n: Notification { id: apoc.create.uuid(), read: false, createdAt: $createdAt })
+    MERGE (n)-[:NOTIFIED]->(u)
+    MERGE (p)-[:NOTIFIED]->(n)
     `
   await session.run(cypher, {
     idsOfMentionedUsers,
@@ -19,20 +21,42 @@ const notify = async (postId, idsOfMentionedUsers, context) => {
   session.close()
 }
 
+const notifyMentionOfComment = async (commentId, idsOfMentionedUsers, context) => {
+  if (!idsOfMentionedUsers.length) return
+
+  const session = context.driver.session()
+  const createdAt = new Date().toISOString()
+  const cypher = `
+    MATCH (u: User) WHERE u.id in $idsOfMentionedUsers
+    MATCH (c: Comment) WHERE c.id = $commentId
+    CREATE (n: Notification { id: apoc.create.uuid(), read: false, createdAt: $createdAt })
+    MERGE (n)-[:NOTIFIED]->(u)
+    MERGE (c)-[:NOTIFIED]->(n)
+    `
+  await session.run(cypher, {
+    idsOfMentionedUsers,
+    createdAt,
+    commentId,
+  })
+  session.close()
+}
+
 const updateHashtagsOfPost = async (postId, hashtags, context) => {
+  if (!hashtags.length) return
+
   const session = context.driver.session()
   // We need two Cypher statements, because the 'MATCH' in the 'cypherDeletePreviousRelations' statement
   //  functions as an 'if'. In case there is no previous relation, the rest of the commands are omitted
   //  and no new Hashtags and relations will be created.
   const cypherDeletePreviousRelations = `
-    MATCH (p:Post { id: $postId })-[previousRelations:TAGGED]->(t:Tag)
+    MATCH (p: Post { id: $postId })-[previousRelations: TAGGED]->(t: Tag)
     DELETE previousRelations
     RETURN p, t
     `
   const cypherCreateNewTagsAndRelations = `
-    MATCH (p:Post { id: $postId})
+    MATCH (p: Post { id: $postId})
     UNWIND $hashtags AS tagName
-    MERGE (t:Tag { id: tagName, name: tagName, disabled: false, deleted: false })
+    MERGE (t: Tag { id: tagName, name: tagName, disabled: false, deleted: false })
     MERGE (p)-[:TAGGED]->(t)
     RETURN p, t
     `
@@ -46,7 +70,7 @@ const updateHashtagsOfPost = async (postId, hashtags, context) => {
   session.close()
 }
 
-const handleContentData = async (resolve, root, args, context, resolveInfo) => {
+const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   // extract user ids before xss-middleware removes classes via the following "resolve" call
   const idsOfMentionedUsers = extractMentionedUsers(args.content)
   // extract tag (hashtag) ids before xss-middleware removes classes via the following "resolve" call
@@ -55,15 +79,29 @@ const handleContentData = async (resolve, root, args, context, resolveInfo) => {
   // removes classes from the content
   const post = await resolve(root, args, context, resolveInfo)
 
-  await notify(post.id, idsOfMentionedUsers, context)
+  await notifyMentionOfPost(post.id, idsOfMentionedUsers, context)
   await updateHashtagsOfPost(post.id, hashtags, context)
 
   return post
 }
 
+const handleContentDataOfComment = async (resolve, root, args, context, resolveInfo) => {
+  // extract user ids before xss-middleware removes classes via the following "resolve" call
+  const idsOfMentionedUsers = extractMentionedUsers(args.content)
+
+  // removes classes from the content
+  const comment = await resolve(root, args, context, resolveInfo)
+
+  await notifyMentionOfComment(comment.id, idsOfMentionedUsers, context)
+
+  return comment
+}
+
 export default {
   Mutation: {
-    CreatePost: handleContentData,
-    UpdatePost: handleContentData,
+    CreatePost: handleContentDataOfPost,
+    UpdatePost: handleContentDataOfPost,
+    CreateComment: handleContentDataOfComment,
+    //UpdateComment: handleContentDataOfComment,
   },
-}
+}
\ No newline at end of file
diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 740578f50..17d8d6458 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -218,12 +218,13 @@ export default {
     EditorMenuBubble,
   },
   props: {
-    users: { type: Array, default: () => [] },
-    hashtags: { type: Array, default: () => [] },
+    users: { type: Array, default: () => [] }, // If 'null', than the Mention extention is not assigned.
+    hashtags: { type: Array, default: () => [] }, // If 'null', than the Hashtag extention is not assigned.
     value: { type: String, default: '' },
     doc: { type: Object, default: () => {} },
   },
   data() {
+    // Set array of optional extensions by analysing the props.
     let optionalExtensions = []
     if (this.users) {
       optionalExtensions.push(