diff --git a/README.rst b/README.rst
index 5c15719..4b03c0a 100644
--- a/README.rst
+++ b/README.rst
@@ -53,6 +53,12 @@
 django-comments-dab
 ===================
 
+Thanks https://www.pythonanywhere.com/
+
+**Here is a** live_ **demo**
+
+.. _live: https://rmustafa.pythonanywhere.com/
+
 Full Documentation_
 
 .. _Documentation: https://django-comment-dab.readthedocs.io/
@@ -99,6 +105,8 @@ It allows you to integrate commenting functionality with any model you have e.g.
 
     8. Resolve or reject flag. This is used to revoke the flagged comment state (admins and moderators)
 
+    9. Follow and unfollow thread. (authenticated users)
+
 - All actions are done by Fetch API since V2.0.0
 
 - Bootstrap 4.1.1 is used in comment templates for responsive design.
@@ -281,6 +289,8 @@ The icons are picked from Feather_. Many thanks to them for the good work.
 .. _Feather: https://feathericons.com
 
 
+Email's HTML template is used from https://github.com/leemunroe/responsive-html-email-template
+
 Contributing
 ============
 
diff --git a/comment/__init__.py b/comment/__init__.py
index 1d47a75..d5950e9 100644
--- a/comment/__init__.py
+++ b/comment/__init__.py
@@ -4,24 +4,20 @@
 
 
 def _get_version():
-    _parent_project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    with open(os.path.join(_parent_project_dir, 'VERSION')) as version_file:
-        version = version_file.read().strip()
-
-    if version.lower().startswith('v'):
-        version = version[1:]
+    parent_project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    with open(os.path.join(parent_project_dir, 'VERSION')) as version_file:
+        version = version_file.read().strip().strip('v')
 
     return version
 
 
 def check_release():
-    release = None
     try:
         release = _get_version()
-    except (FileNotFoundError, Exception):
-        pass
-    if release:
-        assert release == __version__, 'Current version does not match with manifest VERSION'
+    except FileNotFoundError:
+        return
+
+    assert release == __version__, 'Current version does not match with manifest VERSION'
 
 
 check_release()
diff --git a/comment/admin.py b/comment/admin.py
index 7cce37f..edc6855 100644
--- a/comment/admin.py
+++ b/comment/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from comment.models import Comment, Flag, FlagInstance, Reaction, ReactionInstance
+from comment.models import Comment, Flag, FlagInstance, Reaction, ReactionInstance, Follower
 
 
 class CommentModelAdmin(admin.ModelAdmin):
@@ -37,6 +37,13 @@ class FlagModelAdmin(admin.ModelAdmin):
     inlines = [InlineFlagInstance]
 
 
+class FollowerModelAdmin(admin.ModelAdmin):
+    list_display = ('email', 'username', 'content_type', 'content_object')
+    readonly_fields = list_display
+    search_fields = ('email',)
+
+
 admin.site.register(Comment, CommentModelAdmin)
 admin.site.register(Reaction, ReactionModelAdmin)
 admin.site.register(Flag, FlagModelAdmin)
+admin.site.register(Follower, FollowerModelAdmin)
diff --git a/comment/api/permissions.py b/comment/api/permissions.py
index da6c6ea..497b4d1 100644
--- a/comment/api/permissions.py
+++ b/comment/api/permissions.py
@@ -36,3 +36,18 @@ def has_permission(self, request, view):
 
     def has_object_permission(self, request, view, obj):
         return obj.is_flagged and (is_comment_admin(request.user) or is_comment_moderator(request.user))
+
+
+class SubscriptionEnabled(permissions.BasePermission):
+    """
+    This will check if the COMMENT_ALLOW_SUBSCRIPTION is enabled
+    """
+    def has_permission(self, request, view):
+        return getattr(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+
+
+class CanGetSubscribers(SubscriptionEnabled):
+    def has_permission(self, request, view):
+        if not super().has_permission(request, view):
+            return False
+        return is_comment_admin(request.user) or is_comment_moderator(request.user)
diff --git a/comment/api/serializers.py b/comment/api/serializers.py
index 547638c..70081b1 100644
--- a/comment/api/serializers.py
+++ b/comment/api/serializers.py
@@ -7,8 +7,9 @@
 
 from comment.conf import settings
 from comment.models import Comment, Flag, Reaction
-from comment.utils import process_anonymous_commenting, get_user_for_request, get_profile_instance
+from comment.utils import get_user_for_request, get_profile_instance
 from comment.messages import EmailError
+from comment.service.email import DABEmailService
 
 
 def get_profile_model():
@@ -97,6 +98,7 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         user = kwargs['context']['request'].user
+        self.email_service = None
         if user.is_authenticated or not settings.COMMENT_ALLOW_ANONYMOUS:
             del self.fields['email']
 
@@ -122,11 +124,14 @@ def create(self, validated_data):
             parent=self.context['parent_comment'],
             email=email,
             posted=time_posted
-            )
+        )
+        self.email_service = DABEmailService(comment, request)
         if settings.COMMENT_ALLOW_ANONYMOUS and not user:
-            process_anonymous_commenting(request, comment, api=True)
+            self.email_service.send_confirmation_request(api=True)
         else:
             comment.save()
+            if settings.COMMENT_ALLOW_SUBSCRIPTION:
+                self.email_service.send_notification_to_followers()
         return comment
 
 
diff --git a/comment/api/urls.py b/comment/api/urls.py
index 2da71bb..956f0b0 100644
--- a/comment/api/urls.py
+++ b/comment/api/urls.py
@@ -15,6 +15,8 @@
         name='comments-flag-state-change'
     ),
     re_path(r'^comments/confirm/(?P<key>[^/]+)/$', views.ConfirmComment.as_view(), name='confirm-comment'),
+    path('comments/toggle-subscription/', views.ToggleFollowAPI.as_view(), name='toggle-subscription'),
+    path('comments/subscribers/', views.SubscribersAPI.as_view(), name='subscribers'),
 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/comment/api/views.py b/comment/api/views.py
index 09a7f3f..c275b1d 100644
--- a/comment/api/views.py
+++ b/comment/api/views.py
@@ -4,19 +4,21 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from comment.conf import settings
 from comment.validators import ValidatorMixin, ContentTypeValidator
 from comment.api.serializers import CommentSerializer, CommentCreateSerializer
 from comment.api.permissions import (
-    IsOwnerOrReadOnly, FlagEnabledPermission, CanChangeFlaggedCommentState
-)
-from comment.models import Comment, Reaction, ReactionInstance, Flag, FlagInstance
+    IsOwnerOrReadOnly, FlagEnabledPermission, CanChangeFlaggedCommentState,
+    SubscriptionEnabled, CanGetSubscribers)
+from comment.models import Comment, Reaction, ReactionInstance, Flag, FlagInstance, Follower
 from comment.utils import get_comment_from_key, CommentFailReason
 from comment.messages import FlagError, EmailError
+from comment.views import BaseToggleFollowView
+from comment.service.email import DABEmailService
 
 
 class CommentCreate(ValidatorMixin, generics.CreateAPIView):
     serializer_class = CommentCreateSerializer
-    permission_classes = ()
     api = True
 
     def get_serializer_context(self):
@@ -131,15 +133,46 @@ def post(self, request, *args, **kwargs):
 
 
 class ConfirmComment(APIView):
-    @staticmethod
-    def get(request, *args, **kwargs):
+    email_service = None
+
+    def get(self, request, *args, **kwargs):
         key = kwargs.get('key', None)
-        comment = get_comment_from_key(key)
+        temp_comment = get_comment_from_key(key)
 
-        if comment.why_invalid == CommentFailReason.BAD:
+        if temp_comment.why_invalid == CommentFailReason.BAD:
             return Response({'detail': EmailError.BROKEN_VERIFICATION_LINK}, status=status.HTTP_400_BAD_REQUEST)
 
-        if comment.why_invalid == CommentFailReason.EXISTS:
+        if temp_comment.why_invalid == CommentFailReason.EXISTS:
             return Response({'detail': EmailError.USED_VERIFICATION_LINK}, status=status.HTTP_200_OK)
 
-        return Response(CommentSerializer(comment.obj).data, status=status.HTTP_201_CREATED)
+        comment = temp_comment.obj
+        comment.save()
+        comment.refresh_from_db()
+        if settings.COMMENT_ALLOW_SUBSCRIPTION:
+            self.email_service = DABEmailService(comment, request)
+            self.email_service.send_notification_to_followers()
+        return Response(CommentSerializer(comment).data, status=status.HTTP_201_CREATED)
+
+
+class ToggleFollowAPI(BaseToggleFollowView, APIView):
+    api = True
+    response_class = Response
+    permission_classes = (SubscriptionEnabled, permissions.IsAuthenticated)
+
+    def post(self, request, *args, **kwargs):
+        self.validate(request)
+        return super().post(request, *args, **kwargs)
+
+
+class SubscribersAPI(ContentTypeValidator, APIView):
+    api = True
+    permission_classes = (CanGetSubscribers,)
+
+    def get(self, request, *args, **kwargs):
+        self.validate(request)
+        return Response({
+            'app_name': self.model_obj._meta.app_label,
+            'model_name': self.model_obj.__class__.__name__,
+            'model_id': self.model_obj.id,
+            'followers': Follower.objects.get_emails_for_model_object(self.model_obj)
+        })
diff --git a/comment/conf/defaults.py b/comment/conf/defaults.py
index 262609a..19d408d 100644
--- a/comment/conf/defaults.py
+++ b/comment/conf/defaults.py
@@ -26,3 +26,5 @@
 COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME = False
 
 COMMENT_ALLOW_TRANSLATION = False
+
+COMMENT_ALLOW_SUBSCRIPTION = False
diff --git a/comment/locale/hi/LC_MESSAGES/django.po b/comment/locale/hi/LC_MESSAGES/django.po
index e46e965..28cab45 100644
--- a/comment/locale/hi/LC_MESSAGES/django.po
+++ b/comment/locale/hi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-24 06:40+0000\n"
+"POT-Creation-Date: 2020-12-22 08:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ABHYUDAI <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 #: comment/apps.py:8
 msgid "comment"
 msgstr "टिप्पणी"
@@ -42,7 +43,9 @@ msgstr "Comment ऐप: LOGIN_URL सेटिंग में नहीं ह
 msgid ""
 "Your {class_name} class has not defined a {method_name} method, which is "
 "required."
-msgstr "आपकी {class_name} class ने एक {method_name} विधि(method) को परिभाषित नहीं किया है, जिसकी आवश्यकता है"
+msgstr ""
+"आपकी {class_name} class ने एक {method_name} विधि(method) को परिभाषित नहीं किया "
+"है, जिसकी आवश्यकता है"
 
 #: comment/messages.py:7
 msgid "Only AJAX request are allowed"
@@ -93,7 +96,9 @@ msgstr "{model_id} मॉडल के लिए मान्य मॉडल 
 msgid ""
 "{parent_id} is NOT a valid id for a parent comment or the parent comment "
 "does NOT belong to the provided model object"
-msgstr "{parent_id} मूल टिप्पणी के लिए मान्य आईडी नहीं है या मूल टिप्पणी प्रदान की गई मॉडल ऑब्जेक्ट से संबंधित नहीं है"
+msgstr ""
+"{parent_id} मूल टिप्पणी के लिए मान्य आईडी नहीं है या मूल टिप्पणी प्रदान की गई मॉडल "
+"ऑब्जेक्ट से संबंधित नहीं है"
 
 #: comment/messages.py:28
 msgid "Flagging system must be enabled"
@@ -174,7 +179,9 @@ msgstr "टिप्पणी पुष्टि अनुरोध"
 msgid ""
 "We have sent a verification link to your email.The comment will be displayed "
 "after it is verified."
-msgstr "हमने आपके ईमेल पर एक सत्यापन लिंक भेजा है। सत्यापित होने के बाद टिप्पणी प्रदर्शित की जाएगी।"
+msgstr ""
+"हमने आपके ईमेल पर एक सत्यापन लिंक भेजा है। सत्यापित होने के बाद टिप्पणी प्रदर्शित की "
+"जाएगी।"
 
 #: comment/messages.py:62
 msgid "email address, this will be used for verification."
@@ -185,70 +192,101 @@ msgid "email address, it will be used for verification."
 msgstr "ईमेल पता, इसका उपयोग सत्यापन के लिए किया जाएगा।"
 
 #: comment/messages.py:64
+#, python-brace-format
+msgid "{username} added comment to \"{thread_name}\""
+msgstr "{username} में टिप्पणी जोड़ दी \"{thread_name}\""
+
+#: comment/messages.py:65
 msgid "email"
 msgstr "ईमेल"
 
-#: comment/messages.py:68
+#: comment/messages.py:69
 msgid "Unflagged"
 msgstr "फ्लैग नहीं किया गया है"
 
-#: comment/messages.py:69
+#: comment/messages.py:70
 msgid "Flagged"
 msgstr "फ्लैग किया गया है"
 
-#: comment/messages.py:70
+#: comment/messages.py:71
 msgid "Flag rejected by the moderator"
 msgstr "मॉडरेटर द्वारा फ्लैग को अस्वीकार कर दिया गया"
 
-#: comment/messages.py:71
+#: comment/messages.py:72
 msgid "Comment modified by the author"
 msgstr "टिप्पणी को लेखक द्वारा संशोधित किया गया है"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:3
+#: comment/messages.py:76
+msgid "Please insert a valid email"
+msgstr "कृपया एक मान्य ईमेल डालें"
+
+#: comment/messages.py:77
+#, python-brace-format
+msgid "Email is required to subscribe {model_object}"
+msgstr "सदस्यता लेने के लिए ईमेल आवश्यक है {model_object}"
+
+#: comment/messages.py:78
+msgid "Subscribe system must be enabled"
+msgstr "सदस्यता प्रणाली सक्षम होना चाहिए"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:8
 #: comment/templates/comment/anonymous/confirmation_request.txt:2
-msgid "Hey,"
-msgstr "नमस्ते"
+msgid "Hey there,"
+msgstr "सुनो,"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:5
+#: comment/templates/comment/anonymous/confirmation_request.html:10
 msgid ""
-"You or someone on behalf of you have requested to post a comment into this "
+"You or someone on your behalf have requested to post a comment into this "
 "page:"
-msgstr "आप या आपकी ओर से किसी ने इस पृष्ठ पर एक टिप्पणी पोस्ट करने का अनुरोध किया है"
+msgstr "आपने या आपकी ओर से किसी ने इस पर टिप्पणी पोस्ट करने का अनुरोध किया है "
+"पृष्ठ:"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:6
+#: comment/templates/comment/anonymous/confirmation_request.html:12
 #, python-format
 msgid "at %(posted_time)s."
 msgstr "%(posted_time)s पर।"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:9
+#: comment/templates/comment/anonymous/confirmation_request.html:15
+#: comment/templates/comment/notifications/notification.html:27
 msgid "The comment:"
 msgstr "टिप्पणी:"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:13
+#: comment/templates/comment/anonymous/confirmation_request.html:20
 #: comment/templates/comment/anonymous/confirmation_request.txt:12
 msgid ""
 "If you do not wish to post the comment, please ignore this message or report "
 "an incident to"
-msgstr "यदि आप टिप्पणी पोस्ट करने की इच्छा नहीं रखते हैं, कृपया इस संदेश को अनदेखा करें या घटना की रिपोर्ट करें"
+msgstr ""
+"यदि आप टिप्पणी पोस्ट करने की इच्छा नहीं रखते हैं, कृपया इस संदेश को अनदेखा करें या घटना की "
+"रिपोर्ट करें"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:13
-msgid "Otherwise click on the link below to confirm the comment."
-msgstr "अन्यथा टिप्पणी की पुष्टि करने के लिए नीचे दिए गए लिंक पर क्लिक करें।"
+#: comment/templates/comment/anonymous/confirmation_request.html:20
+msgid "Otherwise click on the button below to confirm the comment."
+msgstr "अन्यथा टिप्पणी की पुष्टि करने के लिए नीचे दिए गए बटन पर क्लिक करें।"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:17
-#: comment/templates/comment/anonymous/confirmation_request.txt:16
+#: comment/templates/comment/anonymous/confirmation_request.html:29
+msgid "Confirm your comment"
+msgstr "अपनी टिप्पणी की पुष्टि करें"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:38
 msgid ""
-"If clicking does not work, you can also copy and paste the address into your "
-"browser's address window"
-msgstr "यदि क्लिक करने से काम नहीं चलता है, आप अपने ब्राउज़र की विंडो में लिंक को कॉपी और पेस्ट भी कर सकते हैं"
+"If clicking does not work, you can also copy the below link and paste the "
+"address into your browser's address window"
+msgstr ""
+"यदि क्लिक करने से काम नहीं चलता है, तो आप नीचे दिए गए लिंक को भी कॉपी कर सकते हैं और पेस्ट कर सकते हैं "
+"आपके ब्राउज़र की पता विंडो में पता"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:19
+#: comment/templates/comment/anonymous/confirmation_request.html:41
 #: comment/templates/comment/anonymous/confirmation_request.txt:17
+#: comment/templates/comment/notifications/notification.html:32
+#: comment/templates/comment/notifications/notification.txt:14
 msgid "Thanks for your comment!"
 msgstr "आपके टिप्पणी के लिए धन्यवाद!"
 
-#: comment/templates/comment/anonymous/confirmation_request.html:21
+#: comment/templates/comment/anonymous/confirmation_request.html:43
 #: comment/templates/comment/anonymous/confirmation_request.txt:20
+#: comment/templates/comment/notifications/notification.html:34
+#: comment/templates/comment/notifications/notification.txt:17
 msgid "Kind regards,"
 msgstr "सधन्यवाद,"
 
@@ -262,6 +300,7 @@ msgstr "निम्न URL पर"
 
 #: comment/templates/comment/anonymous/confirmation_request.txt:8
 #: comment/templates/comment/comments/create_comment.html:20
+#: comment/templates/comment/notifications/notification.txt:6
 msgid "Comment"
 msgstr "टिप्पणी"
 
@@ -269,6 +308,16 @@ msgstr "टिप्पणी"
 msgid "Otherwise click on the link below to confirm the comment"
 msgstr "अन्यथा टिप्पणी की पुष्टि करने के लिए नीचे दिए गए लिंक पर क्लिक करें"
 
+#: comment/templates/comment/anonymous/confirmation_request.txt:16
+#: comment/templates/comment/notifications/notification.html:31
+#: comment/templates/comment/notifications/notification.txt:13
+msgid ""
+"If clicking does not work, you can also copy and paste the address into your "
+"browser's address window"
+msgstr ""
+"यदि क्लिक करने से काम नहीं चलता है, आप अपने ब्राउज़र की विंडो में लिंक को कॉपी और पेस्ट भी "
+"कर सकते हैं"
+
 #: comment/templates/comment/anonymous/discarded.html:7
 msgid "Comment discarded"
 msgstr "टिप्पणी अस्वीकृत कर दी गई है"
@@ -285,34 +334,34 @@ msgstr "क्षमा करें, आपकी टिप्पणी स्
 msgid "Comments"
 msgstr "टिप्पणियाँ"
 
-#: comment/templates/comment/comments/comment_content.html:14
+#: comment/templates/comment/comments/comment_content.html:13
 #, python-format
 msgid "view %(comment.user)s profile"
 msgstr "देखें %(comment.user)s का प्रोफ़ाइल"
 
-#: comment/templates/comment/comments/comment_content.html:14
+#: comment/templates/comment/comments/comment_content.html:13
 msgid "comment by anonymous user"
 msgstr "गुमनाम उपयोगकर्ता द्वारा टिप्पणी"
 
-#: comment/templates/comment/comments/comment_content.html:19
+#: comment/templates/comment/comments/comment_content.html:18
 msgid "Edited"
 msgstr "बदला हुआ"
 
-#: comment/templates/comment/comments/comment_content.html:19
+#: comment/templates/comment/comments/comment_content.html:18
 #, python-format
 msgid "Edited: %(edited_time)s ago"
 msgstr "बदला हुआ: %(edited_time)s पहले"
 
-#: comment/templates/comment/comments/comment_content.html:21
+#: comment/templates/comment/comments/comment_content.html:20
 msgid "Posted"
 msgstr "पोस्ट किया गया है"
 
-#: comment/templates/comment/comments/comment_content.html:21
+#: comment/templates/comment/comments/comment_content.html:20
 #, python-format
 msgid "%(posted_time)s ago"
 msgstr "%(posted_time)s पहले"
 
-#: comment/templates/comment/comments/comment_content.html:40
+#: comment/templates/comment/comments/comment_content.html:39
 #, python-format
 msgid " Repl%(plural_str)s "
 msgstr "जवाब %(plural_str)s"
@@ -324,6 +373,7 @@ msgstr "टिप्पणी हटाने की पुष्टि कर
 #: comment/templates/comment/comments/comment_modal.html:7
 #: comment/templates/comment/comments/comment_modal.html:15
 #: comment/templates/comment/flags/flag_modal.html:8
+#: comment/templates/comment/follow/follow_modal.html:8
 msgid "Close"
 msgstr "बंद करे"
 
@@ -428,6 +478,50 @@ msgstr "फ्लैग"
 msgid "flag"
 msgstr "फ्लैग"
 
+#: comment/templates/comment/follow/follow.html:9
+msgid "follow"
+msgstr "का पालन करें"
+
+#: comment/templates/comment/follow/follow_icon.html:3
+msgid "Unfollow this thread"
+msgstr "इस धागे को सामने रखें"
+
+#: comment/templates/comment/follow/follow_icon.html:3
+msgid "Follow this thread"
+msgstr "इस सूत्र का पालन करें"
+
+#: comment/templates/comment/follow/follow_modal.html:7
+msgid "Please insert your email to follow this thread"
+msgstr "कृपया इस धागे का पालन करने के लिए अपना ईमेल डालें"
+
+#: comment/templates/comment/follow/follow_modal.html:25
+msgid "Follow"
+msgstr "का पालन करें"
+
+#: comment/templates/comment/notifications/notification.html:6
+#: comment/templates/comment/notifications/notification.txt:2
+msgid "Hey"
+msgstr "नमस्ते"
+
+#: comment/templates/comment/notifications/notification.html:6
+#: comment/templates/comment/notifications/notification.txt:2
+msgid ","
+msgstr ""
+
+#: comment/templates/comment/notifications/notification.html:9
+#: comment/templates/comment/notifications/notification.txt:4
+msgid "has added a comment at"
+msgstr "पर एक टिप्पणी जोड़ी गई है"
+
+#: comment/templates/comment/notifications/notification.html:9
+#: comment/templates/comment/notifications/notification.txt:4
+msgid "to"
+msgstr "सेवा"
+
+#: comment/templates/comment/notifications/notification.html:18
+msgid "Go to site"
+msgstr "साइट पर जाएं"
+
 #: comment/templates/comment/reactions/reactions.html:5
 msgid "like"
 msgstr "पसंद"
diff --git a/comment/locale/hi/LC_MESSAGES/djangojs.po b/comment/locale/hi/LC_MESSAGES/djangojs.po
index f7502f1..8bdf813 100644
--- a/comment/locale/hi/LC_MESSAGES/djangojs.po
+++ b/comment/locale/hi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-24 08:38+0000\n"
+"POT-Creation-Date: 2020-12-13 13:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ABHYUDAI <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: comment/static/js/comment.js:145 comment/static/js/comment.js:286
+
+#: comment/static/js/comment.js:151 comment/static/js/comment.js:291
 msgid "Replies"
 msgstr "जवाब"
 
-#: comment/static/js/comment.js:147 comment/static/js/comment.js:288
+#: comment/static/js/comment.js:153 comment/static/js/comment.js:293
 msgid "Reply"
 msgstr "जवाब दें"
 
-#: comment/static/js/comment.js:164
+#: comment/static/js/comment.js:170
 msgid "Unable to post your comment!, please try again"
 msgstr "आपकी टिप्पणी पोस्ट करने में असमर्थ!, कृपया पुनः प्रयास करें"
 
-#: comment/static/js/comment.js:185
+#: comment/static/js/comment.js:191
 msgid "You can't edit this comment"
 msgstr "आप इस टिप्पणी को बदल नहीं सकते"
 
-#: comment/static/js/comment.js:208
+#: comment/static/js/comment.js:214
 msgid "Modification didn't take effect!, please try again"
 msgstr "संशोधन प्रभावी नहीं हुआ!, कृपया पुनः प्रयास करें"
 
-#: comment/static/js/comment.js:298
+#: comment/static/js/comment.js:302
 msgid "Unable to delete your comment!, please try again"
 msgstr "आपकी टिप्पणी को हटाने में असमर्थ!, कृपया पुनः प्रयास करें"
 
-#: comment/static/js/comment.js:355
+#: comment/static/js/comment.js:359
 msgid "Reaction couldn't be processed!, please try again"
 msgstr "प्रतिक्रिया संसाधित नहीं की जा सकी!, कृपया पुनः प्रयास करें"
 
-#: comment/static/js/comment.js:462
+#: comment/static/js/comment.js:394
+msgid "Subscription couldn't be processed!, please try again"
+msgstr "सदस्यता संसाधित नहीं हो सकी!, कृपया पुनः प्रयास करें"
+
+#: comment/static/js/comment.js:500
 msgid "Flagging couldn't be processed!, please try again"
 msgstr "फ़्लैगिंग को संसाधित नहीं किया जा सका!, कृपया पुनः प्रयास करें"
 
-#: comment/static/js/comment.js:508
+#: comment/static/js/comment.js:545
 msgid "read more ..."
 msgstr "और पढ़ें ..."
 
-#: comment/static/js/comment.js:510
+#: comment/static/js/comment.js:547
 msgid "read less"
 msgstr "कम पढ़ें"
 
-#: comment/static/js/comment.js:538
+#: comment/static/js/comment.js:575
 msgid "Flag rejected"
 msgstr "फ्लैग को अस्वीकार कर दिया गया"
 
-#: comment/static/js/comment.js:539 comment/static/js/comment.js:557
+#: comment/static/js/comment.js:576 comment/static/js/comment.js:594
 msgid "Reject the flag"
 msgstr "फ्लैग को अस्वीकार करें"
 
-#: comment/static/js/comment.js:544 comment/static/js/comment.js:552
+#: comment/static/js/comment.js:581 comment/static/js/comment.js:589
 msgid "Resolve the flag"
 msgstr "फ्लैग को समाधान करें"
 
-#: comment/static/js/comment.js:551
+#: comment/static/js/comment.js:588
 msgid "Flag resolved"
 msgstr "फ्लैग का समाधान कर दिया गया है"
diff --git a/comment/locale/test/LC_MESSAGES/django.po b/comment/locale/test/LC_MESSAGES/django.po
new file mode 100644
index 0000000..4be95ec
--- /dev/null
+++ b/comment/locale/test/LC_MESSAGES/django.po
@@ -0,0 +1,517 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-25 15:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: comment/apps.py:8
+msgid "comment"
+msgstr"über"
+
+#: comment/conf/defaults.py:13
+msgid "Spam | Exists only to promote a service"
+msgstr"über"
+
+#: comment/conf/defaults.py:14
+msgid "Abusive | Intended at promoting hatred"
+msgstr"über"
+
+#: comment/managers/flags.py:23
+msgid "Something else"
+msgstr"über"
+
+#: comment/messages.py:5
+msgid "Comment App: LOGIN_URL is not in the settings"
+msgstr"über"
+
+#: comment/messages.py:6
+#, python-brace-format
+msgid ""
+"Your {class_name} class has not defined a {method_name} method, which is "
+"required."
+msgstr"{class_name} über {method_name}"
+
+#: comment/messages.py:7
+msgid "Only AJAX request are allowed"
+msgstr"über"
+
+#: comment/messages.py:11
+msgid "error"
+msgstr"über"
+
+#: comment/messages.py:12
+msgid "Bad Request"
+msgstr"über"
+
+#: comment/messages.py:16
+#, python-brace-format
+msgid "{var_name} id must be an integer, {id} is NOT"
+msgstr"{var_name} über {id}"
+
+#: comment/messages.py:17
+msgid "app name must be provided"
+msgstr"über"
+
+#: comment/messages.py:18
+#, python-brace-format
+msgid "{app_name} is NOT a valid app name"
+msgstr"{app_name} über"
+
+#: comment/messages.py:19
+msgid "model name must be provided"
+msgstr"über"
+
+#: comment/messages.py:20
+#, python-brace-format
+msgid "{model_name} is NOT a valid model name"
+msgstr"{model_name} über"
+
+#: comment/messages.py:21
+msgid "model id must be provided"
+msgstr"über"
+
+#: comment/messages.py:22
+#, python-brace-format
+msgid "{model_id} is NOT a valid model id for the model {model_name}"
+msgstr"{model_id} über {model_name}"
+
+#: comment/messages.py:23
+#, python-brace-format
+msgid ""
+"{parent_id} is NOT a valid id for a parent comment or the parent comment "
+"does NOT belong to the provided model object"
+msgstr"{parent_id} über"
+
+#: comment/messages.py:28
+msgid "Flagging system must be enabled"
+msgstr"über"
+
+#: comment/messages.py:29
+msgid "Object must be flagged!"
+msgstr"über"
+
+#: comment/messages.py:30
+#, python-brace-format
+msgid "{state} is an invalid state"
+msgstr"{state} über"
+
+#: comment/messages.py:31
+#, python-brace-format
+msgid "{reason} is an invalid reason"
+msgstr"{reason} über"
+
+#: comment/messages.py:32
+msgid "Please supply some information as the reason for flagging"
+msgstr"über"
+
+#: comment/messages.py:33
+#, python-brace-format
+msgid "This comment is already flagged by this user ({user})"
+msgstr"über ({user})"
+
+#: comment/messages.py:34
+#, python-brace-format
+msgid "This comment was not flagged by this user ({user})"
+msgstr"über ({user})"
+
+#: comment/messages.py:35
+msgid "This action cannot be applied on unflagged comments"
+msgstr"über"
+
+#: comment/messages.py:36
+msgid "The comment must be edited before resolving the flag"
+msgstr"über"
+
+#: comment/messages.py:40
+#, python-brace-format
+msgid ""
+"Reaction must be an valid ReactionManager.RelationType. {reaction_type} is "
+"not"
+msgstr"über {reaction_type}"
+
+#: comment/messages.py:44
+msgid "Email is required for posting anonymous comments."
+msgstr"über"
+
+#: comment/messages.py:45
+msgid "The link seems to be broken."
+msgstr"über"
+
+#: comment/messages.py:46
+msgid "The comment has already been verified."
+msgstr"über"
+
+#: comment/messages.py:50
+msgid "Comment flagged"
+msgstr"über"
+
+#: comment/messages.py:51
+msgid "Comment flag removed"
+msgstr"über"
+
+#: comment/messages.py:55
+msgid "Your reaction has been updated successfully"
+msgstr"über"
+
+#: comment/messages.py:59
+msgid "Comment Confirmation Request"
+msgstr"über"
+
+#: comment/messages.py:60
+msgid ""
+"We have sent a verification link to your email.The comment will be displayed "
+"after it is verified."
+msgstr"über"
+
+#: comment/messages.py:62
+msgid "email address, this will be used for verification."
+msgstr"über"
+
+#: comment/messages.py:63
+msgid "email address, it will be used for verification."
+msgstr"über"
+
+#: comment/messages.py:64
+#, python-brace-format
+msgid "{username} added comment to \"{thread_name}\""
+msgstr"{username} über \"{thread_name}\""
+
+#: comment/messages.py:65
+msgid "email"
+msgstr"über"
+
+#: comment/messages.py:69
+msgid "Unflagged"
+msgstr"über"
+
+#: comment/messages.py:70
+msgid "Flagged"
+msgstr"über"
+
+#: comment/messages.py:71
+msgid "Flag rejected by the moderator"
+msgstr"über"
+
+#: comment/messages.py:72
+msgid "Comment modified by the author"
+msgstr"über"
+
+#: comment/messages.py:76
+msgid "Please insert a valid email"
+msgstr"über"
+
+#: comment/messages.py:77
+#, python-brace-format
+msgid "Email is required to subscribe {model_object}"
+msgstr"über {model_object}"
+
+#: comment/messages.py:78
+msgid "Subscribe system must be enabled"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:8
+#: comment/templates/comment/anonymous/confirmation_request.txt:2
+msgid "Hey there,"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:10
+msgid ""
+"You or someone on your behalf have requested to post a comment into this "
+"page:"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:12
+#, python-format
+msgid "at %(posted_time)s."
+msgstr"über %(posted_time)s."
+
+#: comment/templates/comment/anonymous/confirmation_request.html:15
+#: comment/templates/comment/notifications/notification.html:27
+msgid "The comment:"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:20
+#: comment/templates/comment/anonymous/confirmation_request.txt:12
+msgid ""
+"If you do not wish to post the comment, please ignore this message or report "
+"an incident to"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:20
+msgid "Otherwise click on the button below to confirm the comment."
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:29
+msgid "Confirm your comment"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:38
+msgid ""
+"If clicking does not work, you can also copy the below link and paste the "
+"address into your browser's address window"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:41
+#: comment/templates/comment/anonymous/confirmation_request.txt:17
+#: comment/templates/comment/notifications/notification.html:32
+#: comment/templates/comment/notifications/notification.txt:14
+msgid "Thanks for your comment!"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.html:43
+#: comment/templates/comment/anonymous/confirmation_request.txt:20
+#: comment/templates/comment/notifications/notification.html:34
+#: comment/templates/comment/notifications/notification.txt:17
+msgid "Kind regards,"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.txt:4
+msgid "You or someone on behalf of you have requested to post a comment at"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.txt:4
+msgid "to the following URL"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.txt:8
+#: comment/templates/comment/comments/create_comment.html:20
+#: comment/templates/comment/notifications/notification.txt:6
+msgid "Comment"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.txt:12
+msgid "Otherwise click on the link below to confirm the comment"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/confirmation_request.txt:16
+#: comment/templates/comment/notifications/notification.html:31
+#: comment/templates/comment/notifications/notification.txt:13
+msgid ""
+"If clicking does not work, you can also copy and paste the address into your "
+"browser's address window"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/discarded.html:7
+msgid "Comment discarded"
+msgstr"über"
+
+#: comment/templates/comment/anonymous/discarded.html:13
+msgid "Comment can't be verified."
+msgstr"über"
+
+#: comment/templates/comment/anonymous/discarded.html:14
+msgid "Sorry, your comment has been automatically discarded."
+msgstr"über"
+
+#: comment/templates/comment/comments/base.html:5
+msgid "Comments"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_content.html:13
+#, python-format
+msgid "view %(comment.user)s profile"
+msgstr"%(comment.user)s über"
+
+#: comment/templates/comment/comments/comment_content.html:13
+msgid "comment by anonymous user"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_content.html:18
+msgid "Edited"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_content.html:18
+#, python-format
+msgid "Edited: %(edited_time)s ago"
+msgstr"%(edited_time)s über"
+
+#: comment/templates/comment/comments/comment_content.html:20
+msgid "Posted"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_content.html:20
+#, python-format
+msgid "%(posted_time)s ago"
+msgstr"%(posted_time)s über"
+
+#: comment/templates/comment/comments/comment_content.html:39
+#, python-format
+msgid " Repl%(plural_str)s "
+msgstr"über%(plural_str)s"
+
+#: comment/templates/comment/comments/comment_modal.html:6
+msgid "Confirm comment deletion"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_modal.html:7
+#: comment/templates/comment/comments/comment_modal.html:15
+#: comment/templates/comment/flags/flag_modal.html:8
+#: comment/templates/comment/follow/follow_modal.html:8
+msgid "Close"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_modal.html:12
+msgid "Are you sure you want to delete this comment"
+msgstr"über"
+
+#: comment/templates/comment/comments/comment_modal.html:23
+msgid "Delete"
+msgstr"über"
+
+#: comment/templates/comment/comments/content.html:9
+msgid "read more"
+msgstr"über"
+
+#: comment/templates/comment/comments/create_comment.html:20
+msgid "Reply"
+msgstr"über"
+
+#: comment/templates/comment/comments/create_comment.html:29
+msgid "Comment Anonymously or"
+msgstr"über"
+
+#: comment/templates/comment/comments/create_comment.html:31
+#: comment/templates/comment/comments/create_comment.html:37
+msgid "Login"
+msgstr"über"
+
+#: comment/templates/comment/comments/create_comment.html:33
+msgid "to keep your conversations intact"
+msgstr"über"
+
+#: comment/templates/comment/comments/create_comment.html:39
+msgid "to join the discussion"
+msgstr"über"
+
+#: comment/templates/comment/comments/delete_icon.html:3
+msgid "Delete comment"
+msgstr"über"
+
+#: comment/templates/comment/comments/edit_icon.html:3
+msgid "Edit comment"
+msgstr"über"
+
+#: comment/templates/comment/comments/pagination.html:2
+msgid "Page navigation"
+msgstr"über"
+
+#: comment/templates/comment/comments/pagination.html:3
+msgid "first"
+msgstr"über"
+
+#: comment/templates/comment/comments/pagination.html:4
+msgid "last"
+msgstr"über"
+
+#: comment/templates/comment/comments/pagination.html:5
+msgid "Next"
+msgstr"über"
+
+#: comment/templates/comment/comments/pagination.html:6
+msgid "Previous"
+msgstr"über"
+
+#: comment/templates/comment/comments/reject_icon.html:3
+msgid "Flag rejected"
+msgstr"über"
+
+#: comment/templates/comment/comments/reject_icon.html:3
+msgid "Reject the flag"
+msgstr"über"
+
+#: comment/templates/comment/comments/resolve_icon.html:3
+msgid "Flag resolved"
+msgstr"über"
+
+#: comment/templates/comment/comments/resolve_icon.html:3
+msgid "Resolve the flag"
+msgstr"über"
+
+#: comment/templates/comment/comments/urlhash.html:2
+msgid "Permalink to this comment"
+msgstr"über"
+
+#: comment/templates/comment/flags/flag_icon.html:3
+msgid "Remove flag"
+msgstr"über"
+
+#: comment/templates/comment/flags/flag_icon.html:3
+msgid "Report comment"
+msgstr"über"
+
+#: comment/templates/comment/flags/flag_modal.html:7
+msgid "Please select a reason for flagging"
+msgstr"über"
+
+#: comment/templates/comment/flags/flag_modal.html:22
+msgid "Flag"
+msgstr"über"
+
+#: comment/templates/comment/flags/flags.html:8
+msgid "flag"
+msgstr"über"
+
+#: comment/templates/comment/follow/follow.html:9
+msgid "follow"
+msgstr"über"
+
+#: comment/templates/comment/follow/follow_icon.html:3
+msgid "Unfollow this thread"
+msgstr"über"
+
+#: comment/templates/comment/follow/follow_icon.html:3
+msgid "Follow this thread"
+msgstr"über"
+
+#: comment/templates/comment/follow/follow_modal.html:7
+msgid "Please insert your email to follow this thread"
+msgstr"über"
+
+#: comment/templates/comment/follow/follow_modal.html:28
+msgid "Follow"
+msgstr"über"
+
+#: comment/templates/comment/notifications/notification.html:6
+#: comment/templates/comment/notifications/notification.txt:2
+msgid "Hey"
+msgstr"über"
+
+#: comment/templates/comment/notifications/notification.html:6
+#: comment/templates/comment/notifications/notification.txt:2
+msgid ","
+msgstr"über"
+
+#: comment/templates/comment/notifications/notification.html:9
+#: comment/templates/comment/notifications/notification.txt:4
+msgid "has added a comment at"
+msgstr"über"
+
+#: comment/templates/comment/notifications/notification.html:9
+#: comment/templates/comment/notifications/notification.txt:4
+msgid "to"
+msgstr"über"
+
+#: comment/templates/comment/notifications/notification.html:18
+msgid "Go to site"
+msgstr"über"
+
+#: comment/templates/comment/reactions/reactions.html:5
+msgid "like"
+msgstr"über"
+
+#: comment/templates/comment/reactions/reactions.html:16
+msgid "dislike"
+msgstr"über"
diff --git a/comment/locale/test/LC_MESSAGES/djangojs.po b/comment/locale/test/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000..8b26f41
--- /dev/null
+++ b/comment/locale/test/LC_MESSAGES/djangojs.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-25 15:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: comment/static/js/comment.js:153 comment/static/js/comment.js:297
+msgid "Replies"
+msgstr"über"
+
+#: comment/static/js/comment.js:155 comment/static/js/comment.js:299
+msgid "Reply"
+msgstr"über"
+
+#: comment/static/js/comment.js:176
+msgid "Unable to post your comment!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:197
+msgid "You can't edit this comment"
+msgstr"über"
+
+#: comment/static/js/comment.js:220
+msgid "Modification didn't take effect!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:308
+msgid "Unable to delete your comment!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:365
+msgid "Reaction couldn't be processed!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:400
+msgid "Subscription couldn't be processed!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:506
+msgid "Flagging couldn't be processed!, please try again"
+msgstr"über"
+
+#: comment/static/js/comment.js:551
+msgid "read more ..."
+msgstr"über"
+
+#: comment/static/js/comment.js:553
+msgid "read less"
+msgstr"über"
+
+#: comment/static/js/comment.js:581
+msgid "Flag rejected"
+msgstr"über"
+
+#: comment/static/js/comment.js:582 comment/static/js/comment.js:600
+msgid "Reject the flag"
+msgstr"über"
+
+#: comment/static/js/comment.js:587 comment/static/js/comment.js:595
+msgid "Resolve the flag"
+msgstr"über"
+
+#: comment/static/js/comment.js:594
+msgid "Flag resolved"
+msgstr"über"
diff --git a/comment/managers/followers.py b/comment/managers/followers.py
new file mode 100644
index 0000000..688b56f
--- /dev/null
+++ b/comment/managers/followers.py
@@ -0,0 +1,48 @@
+from django.contrib.contenttypes.models import ContentType
+from django.db import models
+
+from comment.utils import get_username_for_comment
+
+
+class FollowerManager(models.Manager):
+    def is_following(self, email, model_object):
+        content_type = ContentType.objects.get_for_model(model_object)
+        return self.filter(email=email, object_id=model_object.id, content_type=content_type).exists()
+
+    def follow(self, email, username, model_object):
+        if not email or self.is_following(email, model_object):
+            return None
+        return self.create(email=email, username=username, content_object=model_object)
+
+    def unfollow(self, email, model_object):
+        content_type = ContentType.objects.get_for_model(model_object)
+        self.get(email=email, object_id=model_object.id, content_type=content_type).delete()
+
+    def toggle_follow(self, email, username, model_object):
+        if not email:
+            return False
+        if self.is_following(email, model_object):
+            self.unfollow(email, model_object)
+            return False
+        self.follow(email, username, model_object)
+        return True
+
+    def follow_parent_thread_for_comment(self, comment):
+        """This method is used to set the comment's creator as a follower of own comment and the parent thread"""
+        if not comment.email:
+            return
+        username = get_username_for_comment(comment)
+        model_object = comment
+        if not comment.is_parent:
+            model_object = comment.parent
+        else:
+            # follow the main thread for parent comment
+            self.follow(comment.email, username, comment.content_object)
+        self.follow(comment.email, username, model_object)
+
+    def filter_for_model_object(self, model_obj):
+        content_type = ContentType.objects.get_for_model(model_obj)
+        return self.filter(content_type=content_type, object_id=model_obj.id)
+
+    def get_emails_for_model_object(self, model_obj):
+        return self.filter_for_model_object(model_obj).values_list('email', flat=True)
diff --git a/comment/messages.py b/comment/messages.py
index 9e593f0..88b6101 100644
--- a/comment/messages.py
+++ b/comment/messages.py
@@ -56,11 +56,12 @@ class ReactionInfo:
 
 
 class EmailInfo:
-    SUBJECT = _('Comment Confirmation Request')
+    CONFIRMATION_SUBJECT = _('Comment Confirmation Request')
     CONFIRMATION_SENT = _('We have sent a verification link to your email.'
                           'The comment will be displayed after it is verified.')
     INPUT_PLACEHOLDER = _('email address, this will be used for verification.')
     INPUT_TITLE = _('email address, it will be used for verification.')
+    NOTIFICATION_SUBJECT = _('{username} added comment to "{thread_name}"')
     LABEL = _('email')
 
 
@@ -69,3 +70,9 @@ class FlagState:
     FLAGGED = _('Flagged')
     REJECTED = _('Flag rejected by the moderator')
     RESOLVED = _('Comment modified by the author')
+
+
+class FollowError:
+    EMAIL_INVALID = _('Please insert a valid email')
+    EMAIL_REQUIRED = _('Email is required to subscribe {model_object}')
+    SYSTEM_NOT_ENABLED = _('Subscribe system must be enabled')
diff --git a/comment/migrations/0011_follower.py b/comment/migrations/0011_follower.py
new file mode 100644
index 0000000..1f74be2
--- /dev/null
+++ b/comment/migrations/0011_follower.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.4 on 2020-12-21 12:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('comment', '0010_auto_20201023_1442'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Follower',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('email', models.EmailField(max_length=254)),
+                ('username', models.CharField(max_length=50)),
+                ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+            ],
+        ),
+    ]
diff --git a/comment/mixins.py b/comment/mixins.py
index e4ec688..baafdee 100644
--- a/comment/mixins.py
+++ b/comment/mixins.py
@@ -7,7 +7,7 @@
 from comment.conf import settings
 from comment.utils import is_comment_admin, is_comment_moderator
 from comment.validators import ValidatorMixin
-from comment.messages import ErrorMessage, FlagError
+from comment.messages import ErrorMessage, FlagError, FollowError
 
 
 class AJAXRequiredMixin:
@@ -72,7 +72,7 @@ def dispatch(self, request, *args, **kwargs):
 
 class BaseFlagMixin(ObjectLevelMixin, abc.ABC):
     def dispatch(self, request, *args, **kwargs):
-        if not getattr(settings, 'COMMENT_FLAGS_ALLOWED', 0):
+        if not getattr(settings, 'COMMENT_FLAGS_ALLOWED', False):
             return HttpResponseForbidden(FlagError.SYSTEM_NOT_ENABLED)
         return super().dispatch(request, *args, **kwargs)
 
@@ -100,3 +100,10 @@ def dispatch(self, request, *args, **kwargs):
         if not self.has_permission(request):
             return self.handle_no_permission()
         return super().dispatch(request, *args, **kwargs)
+
+
+class CanSubscribeMixin(BaseCommentMixin):
+    def dispatch(self, request, *args, **kwargs):
+        if not getattr(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False):
+            return HttpResponseForbidden(FollowError.SYSTEM_NOT_ENABLED)
+        return super().dispatch(request, *args, **kwargs)
diff --git a/comment/models/__init__.py b/comment/models/__init__.py
index c3ce03c..00fa110 100644
--- a/comment/models/__init__.py
+++ b/comment/models/__init__.py
@@ -2,3 +2,4 @@
 from comment.models.comments import *
 from comment.models.reactions import *
 from comment.models.flags import *
+from comment.models.followers import *
diff --git a/comment/models/comments.py b/comment/models/comments.py
index cf7c5c7..417a29c 100644
--- a/comment/models/comments.py
+++ b/comment/models/comments.py
@@ -8,7 +8,7 @@
 
 from comment.managers import CommentManager
 from comment.conf import settings
-from comment.utils import is_comment_moderator
+from comment.utils import is_comment_moderator, get_username_for_comment
 
 
 class Comment(models.Model):
@@ -33,10 +33,11 @@ class Meta:
         ordering = ['-posted', ]
 
     def __str__(self):
+        username = get_username_for_comment(self)
         if not self.parent:
-            return f'comment by {self.user}: {self.content[:20]}'
+            return f'comment by {username}: {self.content[:20]}'
         else:
-            return f'reply by {self.user}: {self.content[:20]}'
+            return f'reply by {username}: {self.content[:20]}'
 
     def __repr__(self):
         return self.__str__()
diff --git a/comment/models/followers.py b/comment/models/followers.py
new file mode 100644
index 0000000..10080c8
--- /dev/null
+++ b/comment/models/followers.py
@@ -0,0 +1,21 @@
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.db import models
+
+from comment.managers.followers import FollowerManager
+
+
+class Follower(models.Model):
+    email = models.EmailField()
+    username = models.CharField(max_length=50)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    object_id = models.PositiveIntegerField()
+    content_object = GenericForeignKey()
+
+    objects = FollowerManager()
+
+    def __str__(self):
+        return f'{str(self.content_object)} followed by {self.email}'
+
+    def __repr__(self):
+        return self.__str__()
diff --git a/comment/service/__init__.py b/comment/service/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comment/service/email.py b/comment/service/email.py
new file mode 100644
index 0000000..6446202
--- /dev/null
+++ b/comment/service/email.py
@@ -0,0 +1,98 @@
+from threading import Thread
+
+from django.contrib.sites.shortcuts import get_current_site
+from django.core import signing
+from django.core.mail import EmailMultiAlternatives, get_connection
+from django.template import loader
+from django.urls import reverse
+
+from comment.conf import settings
+from comment.messages import EmailInfo
+from comment.models import Follower
+from comment.utils import get_username_for_comment
+
+
+class DABEmailService(object):
+    def __init__(self, comment, request):
+        self.comment = comment
+        self.request = request
+        self.sender = settings.COMMENT_FROM_EMAIL
+        self.is_html = settings.COMMENT_SEND_HTML_EMAIL
+        self.thread = None
+
+    def get_msg_context(self, **context):
+        context['comment'] = self.comment
+        context['site'] = get_current_site(self.request)
+        context['contact'] = settings.COMMENT_CONTACT_EMAIL
+        return context
+
+    def get_message(self, subject, body, receivers, html_msg=None):
+        msg = EmailMultiAlternatives(subject, body, self.sender, receivers)
+        if html_msg:
+            msg.attach_alternative(html_msg, 'text/html')
+        return msg
+
+    def send_messages(self, messages):
+        connection = get_connection()  # Use default email connection
+        self.thread = Thread(target=connection.send_messages, args=(messages,))
+        self.thread.start()
+
+    def get_message_templates(self, text_template, html_template, msg_context):
+        text_msg_template = loader.get_template(text_template)
+        text_msg = text_msg_template.render(msg_context)
+        html_msg = None
+        if self.is_html:
+            html_msg_template = loader.get_template(html_template)
+            html_msg = html_msg_template.render(msg_context)
+        return text_msg, html_msg
+
+    def send_confirmation_request(self, api=False):
+        comment_dict = self.comment.to_dict()
+        receivers = [comment_dict['email']]
+        key = signing.dumps(comment_dict, compress=True)
+        text_template = 'comment/anonymous/confirmation_request.txt'
+        html_template = 'comment/anonymous/confirmation_request.html'
+        subject = EmailInfo.CONFIRMATION_SUBJECT
+        if api:
+            confirmation_url = f'/api/comments/confirm/{key}/'
+        else:
+            confirmation_url = reverse('comment:confirm-comment', args=[key])
+
+        context = self.get_msg_context(confirmation_url=confirmation_url)
+        text_msg, html_msg = self.get_message_templates(text_template, html_template, context)
+        msg = self.get_message(subject, text_msg, receivers, html_msg=html_msg)
+        self.send_messages([msg])
+
+    def get_thread(self):
+        if self.comment.is_parent:
+            return self.comment.content_object
+        return self.comment.parent
+
+    def get_thread_name(self):
+        if self.comment.is_parent:
+            return str(self.comment.content_object)
+        return str(self.comment.parent).split(':')[0]
+
+    def get_subject_for_notification(self, thread_name):
+        username = get_username_for_comment(self.comment)
+        return EmailInfo.NOTIFICATION_SUBJECT.format(username=username, thread_name=thread_name)
+
+    def get_messages_for_notification(self, thread_name, receivers):
+        text_template = 'comment/notifications/notification.txt'
+        html_template = 'comment/notifications/notification.html'
+        subject = self.get_subject_for_notification(thread_name)
+        messages = []
+        for receiver in receivers:
+            context = self.get_msg_context(thread_name=thread_name, receiver=receiver.username)
+            text_msg, html_msg = self.get_message_templates(text_template, html_template, context)
+            messages.append(self.get_message(subject, text_msg, [receiver.email], html_msg=html_msg))
+        return messages
+
+    def send_notification_to_followers(self):
+        thread = self.get_thread()
+        followers = Follower.objects.filter_for_model_object(thread).exclude(email=self.comment.email)
+        if not followers:
+            return
+        thread_name = self.get_thread_name()
+        messages = self.get_messages_for_notification(thread_name, followers)
+        self.send_messages(messages)
diff --git a/comment/signals/post_save.py b/comment/signals/post_save.py
index 547b863..3a0350e 100644
--- a/comment/signals/post_save.py
+++ b/comment/signals/post_save.py
@@ -1,19 +1,17 @@
 from django.dispatch import receiver
 from django.db.models import signals
 
-from comment.models import Comment, Flag, FlagInstance, Reaction, ReactionInstance
+from comment.models import Comment, Flag, FlagInstance, Reaction, ReactionInstance, Follower
+from comment.conf import settings
 
 
 @receiver(signals.post_save, sender=Comment)
-def add_reaction(sender, instance, created, raw, using, update_fields, **kwargs):
+def add_initial_instances(sender, instance, created, raw, using, update_fields, **kwargs):
     if created:
         Reaction.objects.create(comment=instance)
-
-
-@receiver(signals.post_save, sender=Comment)
-def add_flag(sender, instance, created, raw, using, update_fields, **kwargs):
-    if created:
         Flag.objects.create(comment=instance)
+        if settings.COMMENT_ALLOW_SUBSCRIPTION:
+            Follower.objects.follow_parent_thread_for_comment(comment=instance)
 
 
 @receiver(signals.post_save, sender=FlagInstance)
diff --git a/comment/static/css/comment.css b/comment/static/css/comment.css
index 4c4729b..72b0a42 100644
--- a/comment/static/css/comment.css
+++ b/comment/static/css/comment.css
@@ -70,12 +70,15 @@ input#search-input:focus::placeholder {
 #comments .user-has-flagged {
     fill: #ffc96c;
 }
+
 #comments .user-has-not-reacted,
-#comments .user-has-not-flagged {
+#comments .user-has-not-flagged,
+#comments .user-has-followed {
     fill: none;
 }
 #comments .user-has-flagged,
-#comments .user-has-not-flagged {
+#comments .user-has-not-flagged,
+#comments .comment-follow-icon {
     cursor: pointer;
 }
 .flag-modal textarea {
@@ -85,7 +88,8 @@ input#search-input:focus::placeholder {
     color: #999;
 }
 .flag-rejected,
-.flag-resolved {
+.flag-resolved,
+#comments .user-has-followed {
     stroke: #00bc8c;
 }
 .comment-modal {
@@ -150,4 +154,37 @@ input#search-input:focus::placeholder {
     color: #78281f;
     background-color: #fadbd8;
     border-color: #f8cdc8;
-}
\ No newline at end of file
+}
+
+.three-dots {
+    position: relative;
+    width: 5px;
+    height: 5px;
+    background-color: #666;
+    border-radius: 50%;
+    margin-bottom: 2px;
+    margin-top: 2px;
+}
+.three-dots-wrapper {
+    cursor: pointer;
+    width: 10px;
+    padding: 3px;
+}
+
+.three-dots-dropdown {
+    position: absolute;
+    background-color: #f9f9f9;
+    overflow: auto;
+    box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
+    z-index: 10;
+    padding: 0;
+    margin: 0;
+    right: 0;
+}
+.three-dots-dropdown > li {
+    border-bottom: 1px solid #e5e5e5;
+    padding: 0 10px;
+}
+.three-dots-dropdown > li:hover {
+    background: #f1f1f1;
+}
diff --git a/comment/static/js/comment.js b/comment/static/js/comment.js
index c3fe44f..fe039f9 100644
--- a/comment/static/js/comment.js
+++ b/comment/static/js/comment.js
@@ -5,21 +5,28 @@ document.addEventListener('DOMContentLoaded', () => {
     'use strict';
     let currentDeleteCommentButton, commentBeforeEdit;
     let csrfToken = window.CSRF_TOKEN;
+    let deleteModal = document.getElementById("Modal");
+    let flagModal = document.getElementById('flagModal');
+    let followModal = document.getElementById('followModal');
     let headers = {
         'X-Requested-With': 'XMLHttpRequest',
         'X-CSRFToken': csrfToken,
         'Content-Type': 'application/x-www-form-urlencoded'
     };
     document.getElementsByClassName(".js-comment-input").value = '';
-    let removeTargetElement = e => {
+    let removeTargetElement = () => {
         let currentHeight = window.pageYOffset;
         window.location.replace("#");
         // slice off the remaining '#':
         if (typeof window.history.replaceState == 'function') {
             history.replaceState({}, '', window.location.href.slice(0, -1));
         }
-            window.scrollTo(0, currentHeight);
-        }
+        window.scrollTo(0, currentHeight);
+        // close three-dots-menus
+        Array.prototype.forEach.call(document.getElementsByClassName('js-three-dots-menu'), element => {
+            element.classList.add('d-none');
+        });
+    };
 
     let showModal = modalElement => {
         modalElement.style.display = 'block';
@@ -107,11 +114,13 @@ document.addEventListener('DOMContentLoaded', () => {
     let submitCommentCreateForm = form => {
         let formButton = form.querySelector("button");
         let url = form.getAttribute('data-url') || window.location.href;
+        const urlParams = new window.URLSearchParams(window.location.search);
         let formData = serializeObject(form);
+        formData.page = urlParams.get('page');
         // this step is needed to append the form data to request.POST
         let formDataQuery = convertFormDataToURLQuery(formData);
         fetch(url, {
-           method: 'POST',
+            method: 'POST',
             headers: headers,
             body: formDataQuery
         }).then(response => {
@@ -124,7 +133,6 @@ document.addEventListener('DOMContentLoaded', () => {
             return Promise.reject(response);
         }).then(data => {
             if (data.type === 'error') {
-                console.log(data);
                 alert(data.detail);
                 return;
             }
@@ -147,6 +155,10 @@ document.addEventListener('DOMContentLoaded', () => {
                     reply.textContent = gettext("Reply");
                 }
                 commentCount(1);
+                // update followBtn
+                let followButton = form.parentElement.previousElementSibling.querySelector(".js-comment-follow");
+                followButton.querySelector('.comment-follow-icon').classList.add('user-has-followed');
+                followButton.querySelector('span').setAttribute('title', 'Unfollow this thread');
             }
             formButton.setAttribute('disabled', 'disabled');
             let elements = document.getElementsByClassName("js-comment-input");
@@ -160,7 +172,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 let clean_uri = uri.substring(0, uri.indexOf("?"));
                 window.history.replaceState({}, document.title, clean_uri);
             }
-        }).catch(error => {
+        }).catch(() => {
             alert(gettext("Unable to post your comment!, please try again"));
         });
     };
@@ -181,7 +193,7 @@ document.addEventListener('DOMContentLoaded', () => {
             textAreaElement.value = '';
             textAreaElement.value = value;
             textAreaElement.setAttribute("style", "height: " + textAreaElement.scrollHeight + "px;");
-        }).catch(error => {
+        }).catch(() => {
             alert(gettext("You can't edit this comment"));
         });
     };
@@ -204,7 +216,7 @@ document.addEventListener('DOMContentLoaded', () => {
         }).then(data => {
            let updatedContentElement = stringToDom(data, '.js-updated-comment');
            form.parentElement.replaceWith(updatedContentElement);
-        }).catch(error => {
+        }).catch(() => {
            alert(gettext("Modification didn't take effect!, please try again"));
         });
     };
@@ -245,9 +257,8 @@ document.addEventListener('DOMContentLoaded', () => {
         fetch(url, {headers: headers}).then(response => {
             return response.json()
         }).then(data => {
-            let modal = document.getElementById("Modal");
-            showModal(modal);
-            let modalContent = modal.querySelector('.comment-modal-content');
+            showModal(deleteModal);
+            let modalContent = deleteModal.querySelector('.comment-modal-content');
             modalContent.innerHTML = data.html_form;
         }).catch(error => {
             console.error(error);
@@ -290,11 +301,10 @@ document.addEventListener('DOMContentLoaded', () => {
                 // update total count of comments
                 commentCount(-1);
             }
-            let modal = document.getElementById("Modal");
-            hideModal(modal);
+            hideModal(deleteModal);
             commentElement.remove();
 
-        }).catch(error => {
+        }).catch(() => {
             alert(gettext("Unable to delete your comment!, please try again"));
         });
     };
@@ -351,11 +361,53 @@ document.addEventListener('DOMContentLoaded', () => {
                     fillReaction(parentReactionEle, targetReaction);
                     changeReactionCount(parentReactionEle, data.likes, data.dislikes);
                 }
-            }).catch(error => {
+            }).catch(() => {
                 alert(gettext("Reaction couldn't be processed!, please try again"));
             });
         };
 
+    let toggleFollow = (followButton, form) => {
+        let formDataQuery = null;
+        if (form) {
+            let formData = serializeObject(form);
+            formDataQuery = convertFormDataToURLQuery(formData);
+        }
+        let url = followButton.getAttribute('data-url');
+        fetch(url,  {
+            method: 'POST',
+            headers: headers,
+            body: formDataQuery,
+        }).then(response => {
+            return response.json();
+        }).then(data => {
+            const infoElement = data.app_name === 'comment'
+                ? followButton.closest('.js-parent-comment')
+                : document.getElementById('comments').querySelector('.js-comment');
+            if (data.email_required) {
+                followModal.querySelector('form').setAttribute('data-target-btn-id', followButton.getAttribute('id'));
+                showModal(followModal);
+            }
+            else if (data.invalid_email) {
+                form.querySelector('.error').innerHTML = data.invalid_email;
+            }
+            else if (data.following) {
+                followButton.querySelector('.comment-follow-icon').classList.add('user-has-followed');
+                followButton.querySelector('span').setAttribute('title', 'Unfollow this thread');
+                const msg = gettext(`You are now subscribing "${data.model_object}"`);
+                createInfoElement(infoElement, 'success', msg);
+                hideModal(followModal);
+            } else {
+                followButton.querySelector('.comment-follow-icon').classList.remove('user-has-followed');
+                followButton.querySelector('span').setAttribute('title', 'Follow this thread');
+                const msg = gettext(`"${data.model_object}" is now unsubscribed`);
+                createInfoElement(infoElement, 'success', msg);
+                hideModal(followModal);
+            }
+        }).catch(() => {
+            alert(gettext("Subscription couldn't be processed!, please try again"));
+        });
+    };
+
     let fadeOut = (element, duration) => {
       let interval = 10;//ms
         let opacity = 1.0;
@@ -453,21 +505,19 @@ document.addEventListener('DOMContentLoaded', () => {
                 flagIcon.parentElement.title = 'Report Comment';
                 toggleClass(flagIcon, addClass, removeClass, 'remove');
             }
-            let modal = document.getElementById('flagModal');
-            hideModal(modal);
+            hideModal(flagModal);
             if (data) {
                 createInfoElement(flagButton.closest('.js-parent-comment'), data.status, data.msg);
             }
-        }).catch(error => {
+        }).catch(() => {
             alert(gettext("Flagging couldn't be processed!, please try again"));
         });
     };
 
     let handleFlagModal = flagButton => {
-        let modal = document.getElementById('flagModal');
-        showModal(modal);
-        document.getElementById('flagModal').querySelector('textarea').value = '';
-        let form = modal.querySelector('.flag-modal-form');
+        showModal(flagModal);
+        flagModal.querySelector('textarea').value = '';
+        let form = flagModal.querySelector('.flag-modal-form');
         let lastReason = form.querySelector('.flag-last-reason');
         let flagInfo = form.querySelector('textarea');
         flagInfo.style.display = "none";
@@ -484,7 +534,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 }
             });
         };
-        let submit = modal.querySelector('.flag-modal-submit');
+        let submit = flagModal.querySelector('.flag-modal-submit');
         submit.onclick = e => {
             e.preventDefault();
             let choice = form.querySelector('input[name="reason"]:checked');
@@ -563,15 +613,18 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     };
 
+    let openThreeDostMenu = threeDotBtn => {
+        threeDotBtn.nextElementSibling.classList.toggle('d-none');
+    };
+
     document.addEventListener('click', (event) => {
-        removeTargetElement(event);
+        removeTargetElement();
         if (event.target && event.target !== event.currentTarget) {
-            let modal = document.getElementById("Modal");
-            let flagModal = document.getElementById('flagModal');
-           if (event.target === modal || event.target === flagModal ||
+           if (event.target === deleteModal || event.target === flagModal || event.target === followModal ||
                event.target.closest('.modal-close-btn') || event.target.closest('.modal-cancel-btn')) {
-               hideModal(modal);
-               hideModal(flagModal)
+               hideModal(deleteModal);
+               hideModal(flagModal);
+               hideModal(followModal);
            }
            else if(event.target.closest('.js-reply-link')) {
                event.preventDefault();
@@ -605,6 +658,14 @@ document.addEventListener('DOMContentLoaded', () => {
                event.preventDefault();
                toggleFlagState(event.target.closest('.js-flag-reject') || event.target.closest('.js-flag-resolve'));
            }
+           else if (event.target.closest('.js-comment-follow')) {
+               event.preventDefault();
+               toggleFollow(event.target.closest('.js-comment-follow'));
+           }
+           else if (event.target.closest('.js-three-dots')) {
+               event.preventDefault();
+               openThreeDostMenu(event.target.closest('.js-three-dots'));
+           }
         }
     }, false);
 
@@ -624,6 +685,11 @@ document.addEventListener('DOMContentLoaded', () => {
                 event.preventDefault();
                 submitDeleteCommentForm(event.target);
             }
+            else if (event.target.classList.contains('js-comment-follow-form')) {
+                event.preventDefault();
+                let followButton = document.getElementById(event.target.getAttribute('data-target-btn-id'));
+                toggleFollow(followButton, event.target);
+            }
         }
     }, false);
 
diff --git a/comment/templates/comment/anonymous/confirmation_request.html b/comment/templates/comment/anonymous/confirmation_request.html
index 9659949..0163ac2 100644
--- a/comment/templates/comment/anonymous/confirmation_request.html
+++ b/comment/templates/comment/anonymous/confirmation_request.html
@@ -1,20 +1,46 @@
-{% comment %}Inspired from Daniel Rus Morales's django-comments-xtd: * https://github.com/danirus/django-comments-xtd{% endcomment %} {% load i18n %}
-<p class="comment-translatable">{% trans "Hey," %}</p>
+{% extends 'comment/email/base.html' %}
+{% comment %}Inspired from Daniel Rus Morales's django-comments-xtd: * https://github.com/danirus/django-comments-xtd{% endcomment %}
+{% comment %}Email template is used from: * https://github.com/leemunroe/responsive-html-email-template{% endcomment %}
+{% load i18n %}
+{% block content %}
+    <p class="comment-translatable">{% trans "Hey there," %}</p>
 
-<p class="comment-translatable">{% trans "You or someone on behalf of you have requested to post a comment into this page:" %}<br/>
-    <a href="http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}">http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}</a> <span class="comment-translatable">{% blocktrans with posted_time=comment.posted %}at {{ posted_time }}.{% endblocktrans %}</span>
-</p>
+    <p class="comment-translatable">{% trans "You or someone on your behalf have requested to post a comment into this page:" %}<br/>
+        <a href="http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}">http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}</a>
+        <span class="comment-translatable">{% blocktrans with posted_time=comment.posted %}at {{ posted_time }}.{% endblocktrans %}</span>
+    </p>
 
-<p class="comment-translatable">{% trans "The comment:" %}<br/>
-    <i>{{ comment.content }}</i>
+    <p class="comment-translatable">{% trans "The comment:" %}</p>
+    <p><em>{{ comment.content }}</em></p>
     <hr/>
+    <br/>
 
-    <p class="comment-translatable">{% trans "If you do not wish to post the comment, please ignore this message or report an incident to" %} {{ contact }}. <span class="comment-translatable">{% trans "Otherwise click on the link below to confirm the comment." %}</span></p>
+    <p class="comment-translatable">{% trans "If you do not wish to post the comment, please ignore this message or report an incident to" %} {{ contact }}. <span class="comment-translatable">{% trans "Otherwise click on the button below to confirm the comment." %}</span></p>
 
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
+        <tbody>
+            <tr>
+                <td align="left">
+                    <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                        <tbody>
+                            <tr>
+                                <td> <a href="http://{{ site.domain }}{{ confirmation_url }}" target="_blank">{% trans 'Confirm your comment' %}</a> </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    <br/>
+    <p class="comment-translatable">{% trans "If clicking does not work, you can also copy the below link and paste the address into your browser's address window" %}.</p>
     <p><a href="http://{{ site.domain }}{{ confirmation_url }}">http://{{ site.domain }}{{ confirmation_url|slice:":40" }}...</a></p>
-
-    <p class="comment-translatable">{% trans "If clicking does not work, you can also copy and paste the address into your browser's address window" %}.</p>
-
-    <p class="comment-translatable">{% trans "Thanks for your comment!" %}<br/> --
-        <br/>
-    </p class="comment-translatable">{% trans "Kind regards," %}<br/> {{ site }}</p>
+    <br/>
+    <p class="comment-translatable">{% trans "Thanks for your comment!" %}<p>
+    ------
+    <p class="comment-translatable">{% trans "Kind regards," %}
+    <br/> {{ site }}
+    </p>
+{% endblock content %}
+{% block footer %}
+{% endblock footer %}
\ No newline at end of file
diff --git a/comment/templates/comment/anonymous/confirmation_request.txt b/comment/templates/comment/anonymous/confirmation_request.txt
index 66c1b5f..a91e66a 100644
--- a/comment/templates/comment/anonymous/confirmation_request.txt
+++ b/comment/templates/comment/anonymous/confirmation_request.txt
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% trans "Hey," %}
+{% trans "Hey there," %}
 
 {% trans "You or someone on behalf of you have requested to post a comment at" %} {{ comment.posted }}, {% trans "to the following URL" %}.
 
diff --git a/comment/templates/comment/base.html b/comment/templates/comment/base.html
index d47e0bb..72bdc27 100644
--- a/comment/templates/comment/base.html
+++ b/comment/templates/comment/base.html
@@ -1,2 +1,15 @@
 {% include 'comment/static.html' %}
 {% include 'comment/comments/base.html' %}
+
+<div class="comment-modal" id="Modal">
+  <div class="comment-modal-dialog" role="document">
+    <div class="comment-modal-content">
+    </div>
+  </div>
+</div>
+{% if allowed_flags %}
+    {% include "comment/flags/flag_modal.html" %}
+{% endif %}
+{% if is_subscription_allowed %}
+    {% include 'comment/follow/follow_modal.html' %}
+{% endif %}
\ No newline at end of file
diff --git a/comment/templates/comment/comments/base.html b/comment/templates/comment/comments/base.html
index d56749f..7a0059a 100644
--- a/comment/templates/comment/comments/base.html
+++ b/comment/templates/comment/comments/base.html
@@ -3,6 +3,9 @@
 <section id="comments" class="{% block comment_section_cls %}my-5 mx-3{% endblock comment_section_cls %}">
     <script>window.CSRF_TOKEN = "{{ csrf_token }}"</script>
     <strong class="border-bottom bb"><span class="js-comment-number">{% get_comments_count model_object user %}</span><span class="comment-translatable"> {% trans "Comments" %}</span></strong>
+    {% if is_subscription_allowed %}
+        <span class="float-right">{% include 'comment/follow/follow.html' with model_object=model_object btnId=0 %}</span>
+    {% endif %}
     {% block comment_messages %}
     {% include "comment/comments/messages.html" %}
     {% endblock comment_messages %}
@@ -15,17 +18,6 @@
           {% include 'comment/comments/parent_comment.html' with placeholder='reply to this comment...' %}
       {% endfor %}
     </div>
-
-    <div class="comment-modal" id="Modal">
-      <div class="comment-modal-dialog" role="document">
-        <div class="comment-modal-content">
-        </div>
-      </div>
-
-    </div>
-    {% if allowed_flags %}
-        {% include "comment/flags/flag_modal.html" %}
-    {% endif %}
     {% if comments.paginator.num_pages > 1 %}
     {% block pagination %}
     {% include 'comment/comments/pagination.html' with active_btn='bg-success' text_style='text-success' li_cls='page-item rounded mx-1' %}
diff --git a/comment/templates/comment/comments/comment_body.html b/comment/templates/comment/comments/comment_body.html
index 12e938c..f283cd5 100644
--- a/comment/templates/comment/comments/comment_body.html
+++ b/comment/templates/comment/comments/comment_body.html
@@ -9,9 +9,9 @@
         </div>
     {% endif %}
     {% include 'comment/comments/comment_content.html' with comment=comment %}
-    {% if allowed_flags and comment.user != user %}
+    {% if comment.user != user %}
         <div class="col-1">
-            {% include "comment/flags/flags.html" %}
+            {% include 'comment/comments/three_dots_menu.html' %}
         </div>
     {% endif %}
 </div>
diff --git a/comment/templates/comment/comments/comment_content.html b/comment/templates/comment/comments/comment_content.html
index f4730eb..a4d77c6 100644
--- a/comment/templates/comment/comments/comment_content.html
+++ b/comment/templates/comment/comments/comment_content.html
@@ -1,7 +1,6 @@
 {% load comment_tags %}
 {% load i18n %}
 
-
 <div class="js-updated-comment {% if comment.has_flagged_state %}flagged-comment {% endif %}{% block content_wrapper_cls %}{% if has_valid_profile %}col-9 col-md-10{% else %}co-11 mx-3{% endif %}{% endblock content_wrapper_cls %}" id="{{ comment.urlhash }}">
     {% block comment_content %}
     {% render_content comment 30 %}
@@ -39,6 +38,11 @@
                 <a class="js-reply-link {% block reply_link_cls %}btn btn-link ml-1{% endblock reply_link_cls %}" href="#">
                     {% blocktrans with plural_str=reply_count|pluralize:"y,ies" %} Repl{{ plural_str }} {% endblocktrans %}
                 </a>
+                {% if comment.user == user and is_subscription_allowed %}
+                    <div class="d-inline ml-3">
+                        {% include 'comment/follow/follow.html' with model_object=comment btnId=comment.id %}
+                    </div>
+                {% endif %}
             {% endif %}
         </small>
         {% include "comment/reactions/reactions.html" with comment=comment %}
diff --git a/comment/templates/comment/comments/three_dots_menu.html b/comment/templates/comment/comments/three_dots_menu.html
new file mode 100644
index 0000000..b007cab
--- /dev/null
+++ b/comment/templates/comment/comments/three_dots_menu.html
@@ -0,0 +1,28 @@
+{% if allowed_flags and is_subscription_allowed and comment.is_parent %}
+    <div class="js-three-dots three-dots-wrapper float-right">
+        <div class="three-dots"></div>
+        <div class="three-dots"></div>
+        <div class="three-dots"></div>
+    </div>
+    <ul class="js-three-dots-menu three-dots-dropdown d-none">
+        <li>
+            {% include 'comment/follow/follow.html' with model_object=comment btnId=comment.id %}
+        </li>
+        <li>
+            {% if comment.user != user %}
+                {% include "comment/flags/flags.html" %}
+            {% endif %}
+        </li>
+    </ul>
+{% else %}
+    {% if allowed_flags and comment.user != user %}
+        <div class="ml-4">
+            {% include "comment/flags/flags.html" %}
+        </div>
+    {% endif %}
+    {% if comment.is_parent and is_subscription_allowed %}
+        <div class="ml-4">
+            {% include 'comment/follow/follow.html' with model_object=comment btnId=comment.id %}
+        </div>
+    {% endif %}
+{% endif %}
diff --git a/comment/templates/comment/email/base.html b/comment/templates/comment/email/base.html
new file mode 100644
index 0000000..781c028
--- /dev/null
+++ b/comment/templates/comment/email/base.html
@@ -0,0 +1,372 @@
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>{% block emailTemplateTitle %}Simple Transactional Email{% endblock %}</title>
+    <style>
+      /* -------------------------------------
+          GLOBAL RESETS
+      ------------------------------------- */
+
+      /*All the styling goes here*/
+
+      img {
+        border: none;
+        -ms-interpolation-mode: bicubic;
+        max-width: 100%;
+      }
+
+      body {
+        background-color: #f6f6f6;
+        font-family: sans-serif;
+        -webkit-font-smoothing: antialiased;
+        font-size: 14px;
+        line-height: 1.4;
+        margin: 0;
+        padding: 0;
+        -ms-text-size-adjust: 100%;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      table {
+        border-collapse: separate;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        width: 100%; }
+        table td {
+          font-family: sans-serif;
+          font-size: 14px;
+          vertical-align: top;
+      }
+
+      /* -------------------------------------
+          BODY & CONTAINER
+      ------------------------------------- */
+
+      .body {
+        background-color: #f6f6f6;
+        width: 100%;
+      }
+
+      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+      .container {
+        display: block;
+        margin: 0 auto !important;
+        /* makes it centered */
+        max-width: 580px;
+        padding: 10px;
+        width: 580px;
+      }
+
+      /* This should also be a block element, so that it will fill 100% of the .container */
+      .content {
+        box-sizing: border-box;
+        display: block;
+        margin: 0 auto;
+        max-width: 580px;
+        padding: 10px;
+      }
+
+      /* -------------------------------------
+          HEADER, FOOTER, MAIN
+      ------------------------------------- */
+      .main {
+        background: #ffffff;
+        border-radius: 3px;
+        width: 100%;
+      }
+
+      .wrapper {
+        box-sizing: border-box;
+        padding: 20px;
+      }
+
+      .content-block {
+        padding-bottom: 10px;
+        padding-top: 10px;
+      }
+
+      .footer {
+        clear: both;
+        margin-top: 10px;
+        text-align: center;
+        width: 100%;
+      }
+        .footer td,
+        .footer p,
+        .footer span,
+        .footer a {
+          color: #999999;
+          font-size: 12px;
+          text-align: center;
+      }
+
+      /* -------------------------------------
+          TYPOGRAPHY
+      ------------------------------------- */
+      h1,
+      h2,
+      h3,
+      h4 {
+        color: #000000;
+        font-family: sans-serif;
+        font-weight: 400;
+        line-height: 1.4;
+        margin: 0;
+        margin-bottom: 30px;
+      }
+
+      h1 {
+        font-size: 35px;
+        font-weight: 300;
+        text-align: center;
+        text-transform: capitalize;
+      }
+
+      p,
+      ul,
+      ol {
+        font-family: sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        margin: 0;
+        margin-bottom: 15px;
+      }
+        p li,
+        ul li,
+        ol li {
+          list-style-position: inside;
+          margin-left: 5px;
+      }
+
+      a {
+        color: #3498db;
+        text-decoration: underline;
+      }
+
+      /* -------------------------------------
+          BUTTONS
+      ------------------------------------- */
+      .btn {
+        box-sizing: border-box;
+        width: 100%; }
+        .btn > tbody > tr > td {
+          padding-bottom: 15px; }
+        .btn table {
+          width: auto;
+      }
+        .btn table td {
+          background-color: #ffffff;
+          border-radius: 5px;
+          text-align: center;
+      }
+        .btn a {
+          background-color: #ffffff;
+          border: solid 1px #3498db;
+          border-radius: 5px;
+          box-sizing: border-box;
+          color: #3498db;
+          cursor: pointer;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: bold;
+          margin: 0;
+          padding: 12px 25px;
+          text-decoration: none;
+          text-transform: capitalize;
+      }
+
+      .btn-primary table td {
+        background-color: #3498db;
+      }
+
+      .btn-primary a {
+        background-color: #3498db;
+        border-color: #3498db;
+        color: #ffffff;
+      }
+
+      /* -------------------------------------
+          OTHER STYLES THAT MIGHT BE USEFUL
+      ------------------------------------- */
+      .last {
+        margin-bottom: 0;
+      }
+
+      .first {
+        margin-top: 0;
+      }
+
+      .align-center {
+        text-align: center;
+      }
+
+      .align-right {
+        text-align: right;
+      }
+
+      .align-left {
+        text-align: left;
+      }
+
+      .clear {
+        clear: both;
+      }
+
+      .mt0 {
+        margin-top: 0;
+      }
+
+      .mb0 {
+        margin-bottom: 0;
+      }
+
+      .preheader {
+        color: transparent;
+        display: none;
+        height: 0;
+        max-height: 0;
+        max-width: 0;
+        opacity: 0;
+        overflow: hidden;
+        mso-hide: all;
+        visibility: hidden;
+        width: 0;
+      }
+
+      .powered-by a {
+        text-decoration: none;
+      }
+
+      hr {
+        border: 0;
+        border-bottom: 1px solid #f6f6f6;
+        margin: 20px 0;
+      }
+
+      /* -------------------------------------
+          RESPONSIVE AND MOBILE FRIENDLY STYLES
+      ------------------------------------- */
+      @media only screen and (max-width: 620px) {
+        table[class=body] h1 {
+          font-size: 28px !important;
+          margin-bottom: 10px !important;
+        }
+        table[class=body] p,
+        table[class=body] ul,
+        table[class=body] ol,
+        table[class=body] td,
+        table[class=body] span,
+        table[class=body] a {
+          font-size: 16px !important;
+        }
+        table[class=body] .wrapper,
+        table[class=body] .article {
+          padding: 10px !important;
+        }
+        table[class=body] .content {
+          padding: 0 !important;
+        }
+        table[class=body] .container {
+          padding: 0 !important;
+          width: 100% !important;
+        }
+        table[class=body] .main {
+          border-left-width: 0 !important;
+          border-radius: 0 !important;
+          border-right-width: 0 !important;
+        }
+        table[class=body] .btn table {
+          width: 100% !important;
+        }
+        table[class=body] .btn a {
+          width: 100% !important;
+        }
+        table[class=body] .img-responsive {
+          height: auto !important;
+          max-width: 100% !important;
+          width: auto !important;
+        }
+      }
+
+      /* -------------------------------------
+          PRESERVE THESE STYLES IN THE HEAD
+      ------------------------------------- */
+      @media all {
+        .ExternalClass {
+          width: 100%;
+        }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass span,
+        .ExternalClass font,
+        .ExternalClass td,
+        .ExternalClass div {
+          line-height: 100%;
+        }
+        .apple-link a {
+          color: inherit !important;
+          font-family: inherit !important;
+          font-size: inherit !important;
+          font-weight: inherit !important;
+          line-height: inherit !important;
+          text-decoration: none !important;
+        }
+        #MessageViewBody a {
+          color: inherit;
+          text-decoration: none;
+          font-size: inherit;
+          font-family: inherit;
+          font-weight: inherit;
+          line-height: inherit;
+        }
+        .btn-primary table td:hover {
+          background-color: #34495e !important;
+        }
+        .btn-primary a:hover {
+          background-color: #34495e !important;
+          border-color: #34495e !important;
+        }
+      }
+      {% block style %}
+      {% endblock %}
+    </style>
+  </head>
+  <body class="">
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
+      <tr>
+        <td>&nbsp;</td>
+        <td class="container">
+          <div class="content">
+            <!-- START CENTERED WHITE CONTAINER -->
+            <table role="presentation" class="main">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper">
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                    <tr>
+                      <td>
+                        {% block content %}
+                        {% endblock content %}
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+            <!-- END CENTERED WHITE CONTAINER -->
+            <!-- START FOOTER -->
+            <div class="footer">
+                {% block footer %}
+                {% endblock footer %}
+            </div>
+            <!-- END FOOTER -->
+          </div>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
\ No newline at end of file
diff --git a/comment/templates/comment/email/footer.html b/comment/templates/comment/email/footer.html
new file mode 100644
index 0000000..5072b4f
--- /dev/null
+++ b/comment/templates/comment/email/footer.html
@@ -0,0 +1,12 @@
+<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+        <td class="content-block">
+            <span class="apple-link">Company Inc, 3 Abbey Road, San Francisco CA 94102</span>
+            <br> Don't like these emails? <a href="http://i.imgur.com/CScmqnj.gif">Unsubscribe</a>.
+        </td>
+    </tr>
+    <tr>
+        <td class="content-block powered-by">Powered by <a href="http://htmlemail.io">HTMLemail</a>.
+        </td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/comment/templates/comment/flags/flag_modal.html b/comment/templates/comment/flags/flag_modal.html
index ecf17a3..5c5a71a 100644
--- a/comment/templates/comment/flags/flag_modal.html
+++ b/comment/templates/comment/flags/flag_modal.html
@@ -3,13 +3,13 @@
 <div id="flagModal" class="comment-modal">
     <div class="comment-modal-dialog" role="document">
         <div class="comment-modal-content">
-            <div class="flag-modal-header modal-header">
-                <h5 class="comment-translatable flag-modal-title">{% block title %}{% trans "Please select a reason for flagging" %}{% endblock title %}</h5>
+            <div class="modal-header">
+                <h5 class="comment-translatable modal-title">{% block title %}{% trans "Please select a reason for flagging" %}{% endblock title %}</h5>
                 <button class="modal-close-btn" aria-label="{% trans "Close" %}">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="flag-modal-body modal-body">
+            <div class="modal-body">
                 {% render_flag_reasons as reasons %}
                 <form class="flag-modal-form">
                     {% for reason in reasons %}
diff --git a/comment/templates/comment/flags/flags.html b/comment/templates/comment/flags/flags.html
index 9e9b88b..9f28ae0 100644
--- a/comment/templates/comment/flags/flags.html
+++ b/comment/templates/comment/flags/flags.html
@@ -1,11 +1,11 @@
 {% load i18n %}
 {% url 'comment:flag' pk=comment.id  as flag_url %}
 {% if user.is_authenticated %}
-<span class="ml-4 js-comment-flag" data-url="{{ flag_url }}">
+<span class="js-comment-flag" data-url="{{ flag_url }}">
     {% include "comment/flags/flag_icon.html" %}
 </span>
 {% else %}
-<a class="ml-4 js-comment-flag>" href="{{ login_url }}/?next={{ request.build_absolute_uri }}" title="{% trans "flag" %}">
+<a class="js-comment-flag" href="{{ login_url }}/?next={{ request.build_absolute_uri }}" title="{% trans "flag" %}">
     {% include "comment/flags/flag_icon.html" %}
 </a>
 {% endif %}
diff --git a/comment/templates/comment/follow/follow.html b/comment/templates/comment/follow/follow.html
new file mode 100644
index 0000000..beb3a35
--- /dev/null
+++ b/comment/templates/comment/follow/follow.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load comment_tags %}
+{% url 'toggle-subscription' as follow_url %}
+{% if user.is_authenticated %}
+<span id="followBtn-{{ btnId }}" class="js-comment-follow" data-url="{{ follow_url }}?model_name={% get_model_name model_object %}&model_id={{ model_object.id }}&app_name={% get_app_name model_object %}">
+    {% include "comment/follow/follow_icon.html" %}
+</span>
+{% else %}
+<a class="js-comment-follow>" href="{{ login_url }}/?next={{ request.build_absolute_uri }}" title="{% trans "follow" %}">
+    {% include "comment/follow/follow_icon.html" %}
+</a>
+{% endif %}
diff --git a/comment/templates/comment/follow/follow_icon.html b/comment/templates/comment/follow/follow_icon.html
new file mode 100644
index 0000000..d3d4645
--- /dev/null
+++ b/comment/templates/comment/follow/follow_icon.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load comment_tags %}
+<span title="{% if user|has_followed:comment %}{% trans 'Unfollow this thread' %}{% else %}{% trans 'Follow this thread' %}{% endif %}">
+{% block follow_img_icon %}
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none"
+     stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+     class="comment-follow-icon {% if user|has_followed:model_object %}user-has-followed{% endif %}">
+    <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path>
+    <polyline points="22 4 12 14.01 9 11.01"></polyline>
+</svg>
+{% endblock follow_img_icon %}
+</span>
diff --git a/comment/templates/comment/follow/follow_modal.html b/comment/templates/comment/follow/follow_modal.html
new file mode 100644
index 0000000..52136d7
--- /dev/null
+++ b/comment/templates/comment/follow/follow_modal.html
@@ -0,0 +1,39 @@
+{% load i18n %}
+{% load comment_tags %}
+<div id="followModal" class="comment-modal">
+    <div class="comment-modal-dialog" role="document">
+        <div class="comment-modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">{% block title %}{% trans "Please insert your email to follow this thread" %}{% endblock title %}</h5>
+                <button class="modal-close-btn" aria-label="{% trans "Close" %}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form class="js-comment-follow-form">
+                {% block email_input %}
+                    <div class="row">
+                        <div class="col-3">
+                            <label for="email">Email:</label>
+                        </div>
+                        <div class="col-9">
+
+                            <input id="email" class="form-control mr-2 w-100" type="email" name="email" required>
+                            <div class="error text-danger small mt-1"></div>
+                        </div>
+                    </div>
+                {% endblock email_input %}
+                    <br>
+                    <div class="follow-modal-footer modal-footer">
+                        {% trans "Follow" as follow %}
+                        <button type="submit"
+                                title="{{ follow }}"
+                                class="btn btn-sm btn-success follow-modal-submit {% block follow_btn_extra_cls %}{% endblock follow_btn_extra_cls %}"
+                        data-url="{% url 'toggle-subscription' %}">{{ follow }}</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
diff --git a/comment/templates/comment/notifications/notification.html b/comment/templates/comment/notifications/notification.html
new file mode 100644
index 0000000..fd7ebd9
--- /dev/null
+++ b/comment/templates/comment/notifications/notification.html
@@ -0,0 +1,38 @@
+{% extends 'comment/email/base.html' %}
+{% comment %}Email template is used from: * https://github.com/leemunroe/responsive-html-email-template{% endcomment %}
+{% load i18n %}
+{% block content %}
+    <p class="comment-translatable">{% trans "Hey" %} {{receiver}}{% trans "," %} </p>
+
+    <p class="comment-translatable">
+        <strong>{{comment.user}}</strong> {% trans 'has added a comment at' %} {{ comment.posted }}, {% trans "to" %} "{{thread_name}}".
+    </p>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
+        <tbody>
+            <tr>
+                <td align="left">
+                    <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                        <tbody>
+                            <tr>
+                                <td> <a href="http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}" target="_blank">{% trans 'Go to site' %}</a> </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    <br/>
+    <p class="comment-translatable">{% trans "The comment:" %}</p>
+    <p><em>{{ comment.content }}</em></p>
+    <hr/>
+    <br/>
+    <p class="comment-translatable">{% trans "If clicking does not work, you can also copy and paste the address into your browser's address window" %}.</p>
+    <p class="comment-translatable">{% trans "Thanks for your comment!" %}<p>
+    ------
+    <p class="comment-translatable">{% trans "Kind regards," %}
+    <br/> {{ site }}
+    </p>
+{% endblock content %}
+{% block footer %}
+{% endblock footer %}
\ No newline at end of file
diff --git a/comment/templates/comment/notifications/notification.txt b/comment/templates/comment/notifications/notification.txt
new file mode 100644
index 0000000..e52519d
--- /dev/null
+++ b/comment/templates/comment/notifications/notification.txt
@@ -0,0 +1,18 @@
+{% load i18n %}
+{% trans "Hey" %} {{receiver}}{% trans "," %}
+
+{{comment.user}} {% trans "has added a comment at" %} {{ comment.posted }}, {% trans "to" %} {{thread_name}}.
+
+--- {% trans "Comment" %}: ---
+{{ comment.content }}
+
+http://{{ site.domain }}{{ comment.content_object.get_absolute_url }}
+----------------
+
+
+{% trans "If clicking does not work, you can also copy and paste the address into your browser's address window" %}.
+{% trans "Thanks for your comment!" %}
+
+----------------
+{% trans "Kind regards," %}
+{{ site }}
diff --git a/comment/templatetags/comment_tags.py b/comment/templatetags/comment_tags.py
index e32f0fb..fa3f35d 100644
--- a/comment/templatetags/comment_tags.py
+++ b/comment/templatetags/comment_tags.py
@@ -1,12 +1,12 @@
 from django import template
 
-from comment.models import ReactionInstance, FlagInstance
+from comment.models import ReactionInstance, FlagInstance, Follower
 from comment.forms import CommentForm
 from comment.utils import (
-    get_comment_context_data, is_comment_moderator, is_comment_admin, get_gravatar_img, get_profile_instance
+    get_comment_context_data, is_comment_moderator, is_comment_admin, get_gravatar_img, get_profile_instance,
+    get_username_for_comment as get_username
 )
 from comment.managers import FlagInstanceManager
-from comment.conf import settings
 from comment.messages import ReactionError
 
 register = template.Library()
@@ -26,11 +26,7 @@ def get_app_name(obj):
 
 @register.simple_tag(name='get_username_for_comment')
 def get_username_for_comment(comment):
-    if not comment.user:
-        if settings.COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME:
-            return comment.email.split('@')[0]
-        return settings.COMMENT_ANONYMOUS_USERNAME
-    return comment.user.username
+    return get_username(comment)
 
 
 @register.simple_tag(name='get_profile_url')
@@ -158,6 +154,13 @@ def has_flagged(user, comment):
     return False
 
 
+@register.filter(name='has_followed')
+def has_followed(user, model_object):
+    if user.is_authenticated:
+        return Follower.objects.is_following(user.email, model_object)
+    return False
+
+
 @register.simple_tag(name='render_flag_reasons')
 def render_flag_reasons():
     return FlagInstanceManager.reasons_list
diff --git a/comment/tests/base.py b/comment/tests/base.py
index 9f8e1a4..a4b6df0 100644
--- a/comment/tests/base.py
+++ b/comment/tests/base.py
@@ -22,52 +22,8 @@
 
 
 class BaseInternationalizationTest:
-    prefix = 'ङङङ '
     translatable_attrs = ['title', 'aria-label']
 
-    def mock_get_text_function_for_hindi(self):
-        '''just adds a prefix to the front of all strings'''
-        def wrapper(func):
-            '''A decorator function that just adds a prefix to the front of all strings'''
-            def new_func(*args, **kwargs):
-                output = func(*args, **kwargs)
-                return self.prefix + output
-            return new_func
-
-        old_lang = translation.get_language()
-        # Activate hindi, so that if the hi files haven't
-        # been loaded, they will be loaded now.
-        translation.activate("hi")
-
-        hindi_translation = translation.trans_real._active.value
-
-        # wrap the gettext and ungettext functions so that 'ङङङ '
-        # will prefix each translation
-        hindi_translation.gettext = wrapper(hindi_translation.gettext)
-
-        # Turn back on our old translations
-        translation.activate(old_lang)
-        del old_lang
-
-    def remove_mocked_prefix_from_get_text_function_for_hindi(self):
-        def wrapper(func):
-            '''A decorator function that just removes the mock prefix added to the front of all strings'''
-            def new_func(*args, **kwargs):
-                output = func(*args, **kwargs)
-                return output[len(self.prefix):]
-            return new_func
-
-        old_lang = translation.get_language()
-        translation.activate('hi')
-        hindi_translation = translation.trans_real._active.value
-
-        # wrap the gettext and ungettext functions so that 'ङङङ '
-        # will prefix each translation
-        hindi_translation.gettext = wrapper(hindi_translation.gettext)
-
-        # Turn back on our old translations
-        translation.activate(old_lang)
-
     @staticmethod
     def has_translatable_html_text(element):
         if "comment-translatable" in element.attrib.get('class', '').split():
@@ -81,8 +37,12 @@ def has_translatable_html_attr(element, attr):
         return False
 
     @staticmethod
-    def has_string(string_to_search, sub_string):
-        return string_to_search.strip().startswith(sub_string)
+    def is_translated(text):
+        try:
+            text.encode('ascii')
+        except UnicodeEncodeError:
+            return True
+        return False
 
     @staticmethod
     def get_view_from_url_or_none(url):
@@ -111,6 +71,10 @@ def setUpTestData(cls):
             email="test-2@acme.edu",
             password="1234"
         )
+        cls.user_without_email = User.objects.create_user(
+            username="no-email",
+            password="1234"
+        )
         cls.moderator = User.objects.create_user(
             username="moderator",
             email="test-2@acme.edu",
@@ -145,10 +109,8 @@ def setUpTestData(cls):
     def setUp(self):
         super().setUp()
         self.client.force_login(self.user_1)
-        self.mock_get_text_function_for_hindi()
-        translation.activate("hi")
+        translation.activate("test")
         self.addCleanup(patch.stopall)
-        self.addCleanup(self.remove_mocked_prefix_from_get_text_function_for_hindi)
 
     @classmethod
     def increase_comment_count(cls):
@@ -218,17 +180,19 @@ def create_flag_instance(cls, user, comment, **kwargs):
 
     def _check_translatable_html_text(self, element, url):
         if self.has_translatable_html_text(element):
-            self.assertEqual(True, self.has_string(element.text, self.prefix), (
-                f'No translation for the element {element.tag} with text "{element.text}" '
-                f'from view {self.get_view_from_url_or_none(url)}')
+            self.assertTrue(
+                self.is_translated(element.text),
+                (f'No translation for the element {element.tag} with text "{element.text}" '
+                 f'from view {self.get_view_from_url_or_none(url)}')
             )
 
     def _check_translatable_html_attrs(self, element, url):
         for attr in self.translatable_attrs:
             if self.has_translatable_html_attr(element, attr):
-                self.assertEqual(True, self.has_string(element.attrib.get(attr), self.prefix), (
-                    f'No translation for the attribute "{attr}" of the element {element.tag} with the '
-                    f'value "{element.attrib.get(attr)}" from view {self.get_view_from_url_or_none(url)}')
+                self.assertTrue(
+                    self.is_translated(element.attrib.get(attr)),
+                    (f'No translation for the attribute "{attr}" of the element {element.tag} with the '
+                     f'value "{element.attrib.get(attr)}" from view {self.get_view_from_url_or_none(url)}')
                 )
 
     def assertHtmlTranslated(self, html, url=None):
@@ -240,9 +204,8 @@ def assertHtmlTranslated(self, html, url=None):
             self._check_translatable_html_attrs(element, url)
 
     def assertTextTranslated(self, text, url=None):
-        self.assertEqual(
-            True,
-            self.has_string(text, self.prefix),
+        self.assertTrue(
+            self.is_translated(text),
             f'No translation for the text "{text}" from view {self.get_view_from_url_or_none(url)}'
         )
 
@@ -305,6 +268,7 @@ class BaseCommentFlagTest(BaseCommentViewTest):
     def setUpTestData(cls):
         super().setUpTestData()
         cls.comment = cls.create_comment(cls.content_object_1)
+        cls.comment_for_change_state = cls.create_comment(cls.content_object_1)
         cls.user = cls.user_1
         cls.flag_data = {
             'reason': str(FlagInstance.objects.reason_values[0]),
diff --git a/comment/tests/test_api/__init__.py b/comment/tests/test_api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comment/tests/test_api/test_serializers.py b/comment/tests/test_api/test_serializers.py
new file mode 100644
index 0000000..b7e00dd
--- /dev/null
+++ b/comment/tests/test_api/test_serializers.py
@@ -0,0 +1,197 @@
+from unittest.mock import patch
+
+from django.core import mail
+from django.test import RequestFactory
+
+from comment.conf import settings
+from comment.models import Comment, Follower
+from comment.api.serializers import get_profile_model, get_user_fields, UserSerializerDAB, CommentCreateSerializer, \
+    CommentSerializer
+from comment.tests.test_api.test_views import APIBaseTest
+
+
+class APICommentSerializers(APIBaseTest):
+    def setUp(self):
+        super().setUp()
+        self.parent_count = Comment.objects.filter_parents_by_object(self.post_1).count()
+        self.all_count = Comment.objects.all().count()
+
+    def increase_count(self, parent=False):
+        if parent:
+            self.parent_count += 1
+        self.all_count += 1
+
+    def comment_count_test(self):
+        self.assertEqual(Comment.objects.filter_parents_by_object(self.post_1).count(), self.parent_count)
+        self.assertEqual(Comment.objects.all().count(), self.all_count)
+
+    def test_get_profile_model(self):
+        # missing settings attrs
+        patch.object(settings, 'PROFILE_APP_NAME', None).start()
+        profile = get_profile_model()
+        self.assertIsNone(profile)
+
+        # providing wrong attribute value, an exception is raised
+        patch.object(settings, 'PROFILE_APP_NAME', 'wrong').start()
+        self.assertRaises(LookupError, get_profile_model)
+
+        # attribute value is None
+        patch.object(settings, 'PROFILE_APP_NAME', None).start()
+        profile = get_profile_model()
+        self.assertIsNone(profile)
+
+        # success
+        patch.object(settings, 'PROFILE_APP_NAME', 'user_profile').start()
+        profile = get_profile_model()
+        self.assertIsNotNone(profile)
+
+    def test_get_user_fields(self):
+        fields = get_user_fields()
+        self.assertEqual(fields, ('id', 'username', 'email', 'profile'))
+
+        mocked_hasattr = patch('comment.api.serializers.hasattr').start()
+        mocked_hasattr.return_value = True
+        fields = get_user_fields()
+        self.assertEqual(fields, ('id', 'username', 'email', 'profile', 'logentry'))
+
+    def test_user_serializer(self):
+        # PROFILE_MODEL_NAME not provided
+        patch.object(settings, 'PROFILE_MODEL_NAME', None).start()
+        profile = UserSerializerDAB.get_profile(self.user_1)
+        self.assertIsNone(profile)
+
+        # PROFILE_MODEL_NAME is wrong
+        patch.object(settings, 'PROFILE_MODEL_NAME', 'wrong').start()
+        profile = UserSerializerDAB.get_profile(self.user_1)
+        self.assertIsNone(profile)
+
+        # success
+        patch.object(settings, 'PROFILE_MODEL_NAME', 'userprofile').start()
+        profile = UserSerializerDAB.get_profile(self.user_1)
+        self.assertIsNotNone(profile)
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', False)
+    def test_create_parent_comment_serializer(self):
+        self.assertEqual(self.parent_count, 3)
+        self.assertEqual(self.all_count, 8)
+
+        factory = RequestFactory()
+        request = factory.get('/')
+        request.user = self.user_1
+        data = {
+            'model_obj': self.post_1,
+            'parent_comment': None,
+            'request': request
+        }
+
+        serializer = CommentCreateSerializer(context=data)
+        self.assertIsNone(serializer.fields.get('email'))
+        comment = serializer.create(validated_data={'content': 'test'})
+        self.increase_count(parent=True)
+        self.comment_count_test()
+        self.assertIsNotNone(comment)
+
+        # get parent
+        parent_id = serializer.get_parent(comment)
+        self.assertIsNone(parent_id)
+
+        # get replies
+        replies = serializer.get_replies(comment)
+        reply_count = serializer.get_reply_count(comment)
+        self.assertEqual(replies, [])
+        self.assertEqual(reply_count, 0)
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', False)
+    def test_create_child_comment_serializer(self):
+        self.assertEqual(self.parent_count, 3)
+        self.assertEqual(self.all_count, 8)
+
+        factory = RequestFactory()
+        request = factory.get('/')
+        request.user = self.user_1
+        data = {
+            'model_obj': self.post_1,
+            'request': request,
+            'parent_comment': self.comment_1
+        }
+
+        serializer = CommentCreateSerializer(context=data)
+        comment = serializer.create(validated_data={'content': 'test'})
+        self.increase_count()
+        self.comment_count_test()
+        self.assertIsNotNone(comment)
+
+        # get parent
+        parent_id = CommentCreateSerializer.get_parent(comment)
+        self.assertEqual(parent_id, data['parent_comment'].id)
+
+        replies = serializer.get_replies(self.comment_1)
+        reply_count = serializer.get_reply_count(self.comment_1)
+        self.assertIsNotNone(replies)
+        self.assertEqual(reply_count, 2)
+
+        replies = serializer.get_replies(self.comment_4)
+        reply_count = serializer.get_reply_count(self.comment_4)
+        self.assertEqual(replies, [])
+        self.assertEqual(reply_count, 0)
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', False)
+    def test_send_notification(self):
+        factory = RequestFactory()
+        request = factory.get('/')
+        request.user = self.user_1
+        data = {
+            'model_obj': self.post_1,
+            'request': request,
+            'parent_comment': self.comment_1
+        }
+
+        Follower.objects.follow('e@e.com', 'testUser', self.comment_1)
+
+        serializer = CommentCreateSerializer(context=data)
+        comment = serializer.create(validated_data={'content': 'test'})
+        self.assertTrue(serializer.email_service.thread.is_alive)
+        self.assertIsNotNone(comment)
+        self.assertIsNotNone(serializer.email_service.thread)
+        serializer.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
+
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', True)
+    def test_create_comment_serializer_for_anonymous(self):
+        from django.contrib.auth.models import AnonymousUser
+        factory = RequestFactory()
+        request = factory.get('/')
+        request.user = AnonymousUser()
+        data = {
+            'model_obj': self.post_1,
+            'parent_comment': None,
+            'request': request
+        }
+        serializer = CommentCreateSerializer(context=data)
+
+        self.assertIsNotNone(serializer.fields['email'])
+        comment = serializer.create(validated_data={
+            'content': 'anonymous posting',
+            'email': 'abc@abc.com'
+        })
+        # no creation occurs until comment is verified
+        self.comment_count_test()
+        self.assertIsNotNone(comment)
+
+        # confirmation email is sent
+        self.assertIsNotNone(serializer.email_service.thread)
+        serializer.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
+
+    def test_passing_context_to_serializer(self):
+        serializer = CommentSerializer(self.comment_1)
+        self.assertFalse(serializer.fields['content'].read_only)
+
+        serializer = CommentSerializer(self.comment_1, context={'reaction_update': True})
+        self.assertTrue(serializer.fields['content'].read_only)
+
+        serializer = CommentSerializer(self.comment_1, context={'flag_update': True})
+        self.assertTrue(serializer.fields['content'].read_only)
diff --git a/comment/tests/test_api.py b/comment/tests/test_api/test_views.py
similarity index 77%
rename from comment/tests/test_api.py
rename to comment/tests/test_api/test_views.py
index f5a11df..5633f90 100644
--- a/comment/tests/test_api.py
+++ b/comment/tests/test_api/test_views.py
@@ -2,20 +2,21 @@
 from unittest.mock import patch
 
 from django.test import RequestFactory
-from django.core import signing
+from django.core import signing, mail
+
 from rest_framework import status
 
 from comment.conf import settings
 from comment.models import Comment, FlagInstanceManager
 from comment.messages import ContentTypeError, EmailError
-from comment.api.serializers import get_profile_model, get_user_fields, UserSerializerDAB, CommentCreateSerializer, \
-    CommentSerializer
+from comment.api.serializers import CommentSerializer
 from comment.api.permissions import (
-    IsOwnerOrReadOnly, FlagEnabledPermission, CanChangeFlaggedCommentState
-)
+    IsOwnerOrReadOnly, FlagEnabledPermission, CanChangeFlaggedCommentState, SubscriptionEnabled,
+    CanGetSubscribers)
 from comment.api.views import CommentList
 from comment.tests.base import BaseCommentTest, timezone
 from comment.tests.test_utils import BaseAnonymousCommentTest
+from comment.utils import is_comment_admin, is_comment_moderator
 
 
 class APIBaseTest(BaseCommentTest):
@@ -45,6 +46,8 @@ def setUp(self):
         self.owner_permission = IsOwnerOrReadOnly()
         self.flag_enabled_permission = FlagEnabledPermission()
         self.can_change_flagged_comment_state = CanChangeFlaggedCommentState()
+        self.subscription_enabled = SubscriptionEnabled()
+        self.get_subscribers_permission = CanGetSubscribers()
         self.factory = RequestFactory()
         self.view = CommentList()
 
@@ -117,6 +120,43 @@ def test_can_change_flagged_comment_state(self):
             self.can_change_flagged_comment_state.has_object_permission(request, self.view, comment)
         )
 
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_normal_users_cannot_retrieve_subscribers(self):
+        request = self.factory.get('/')
+        request.user = self.user_1
+        self.assertFalse(is_comment_admin(self.user_1))
+        self.assertFalse(is_comment_moderator(self.user_1))
+        self.assertTrue(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        self.assertFalse(self.get_subscribers_permission.has_permission(request, self.view))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_only_moderators_can_retrieve_subscribers(self):
+        request = self.factory.get('/')
+        request.user = self.moderator
+        self.assertTrue(is_comment_moderator(self.moderator))
+        self.assertTrue(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        self.assertTrue(self.get_subscribers_permission.has_permission(request, self.view))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_cannot_retrieve_subscribers_when_system_disabled(self):
+        request = self.factory.get('/')
+        request.user = self.moderator
+        self.assertTrue(is_comment_moderator(self.moderator))
+        self.assertFalse(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        self.assertFalse(self.get_subscribers_permission.has_permission(request, self.view))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_cannot_subscribe_when_system_disabled(self):
+        request = self.factory.post('/')
+        self.assertFalse(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        self.assertFalse(self.subscription_enabled.has_permission(request, self.view))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_can_subscribe(self):
+        request = self.factory.post('/')
+        self.assertTrue(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        self.assertTrue(self.subscription_enabled.has_permission(request, self.view))
+
 
 class APICommentViewsTest(APIBaseTest):
     def setUp(self):
@@ -234,7 +274,7 @@ def test_retrieving_comment_list_with_invalid_model_id(self):
         )
         self.assertTextTranslated(response.data['detail'], url)
 
-    def test_create_comment(self):
+    def test_create_parent_comment(self):
         # create parent comment
         self.assertEqual(self.comment_count, 3)
         self.assertEqual(self.all_comments, 8)
@@ -251,6 +291,13 @@ def test_create_comment(self):
         self.increase_count(parent=True)
         self.comment_count_test()
 
+    def test_create_child_comment(self):
+        # create parent comment
+        self.assertEqual(self.comment_count, 3)
+        self.assertEqual(self.all_comments, 8)
+
+        base_url = '/api/comments/create/'
+        url_data = self.url_data.copy()
         # create child comment
         url_data['parent_id'] = 1
         data = {'content': 'new child comment from api'}
@@ -268,6 +315,11 @@ def test_create_comment(self):
         self.increase_count(parent=True)
         self.comment_count_test()
 
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', True)
+    def test_create_comment_for_anonymous_with_invalid_data(self):
+        base_url = '/api/comments/create/'
+        url_data = self.url_data.copy()
+
         # test anonymous commenting
         self.client.logout()
 
@@ -279,6 +331,16 @@ def test_create_comment(self):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(response.json()['email'], [EmailError.EMAIL_MISSING])
         self.assertTextTranslated(response.json()['email'][0], base_url)
+
+    @patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', True)
+    def test_create_comment_for_anonymous_with_valid_data(self):
+        base_url = '/api/comments/create/'
+        url_data = self.url_data.copy()
+        url = self.get_url(base_url, **url_data)
+
+        # test anonymous commenting
+        self.client.logout()
+
         # test valid data
         data = {'content': 'new anonymous comment from api', 'email': 'a@a.com'}
 
@@ -614,147 +676,97 @@ def test_comment_exists(self):
         self.assertTextTranslated(response.data['detail'], url)
         self.assertEqual(Comment.objects.all().count(), init_count)
 
-    def test_success(self):
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_success_without_notification(self):
         response = self.client.get(self.get_url())
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         comment = Comment.objects.get(email=self.comment_obj.email, posted=self.time_posted)
         self.assertEqual(response.data, CommentSerializer(comment).data)
         self.assertEqual(Comment.objects.all().count(), self.init_count + 1)
+        self.assertEqual(len(mail.outbox), 0)
 
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_success_with_notification(self):
+        response = self.client.get(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        response.renderer_context['view'].email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
 
-class APICommentSerializers(APIBaseTest):
-    def setUp(self):
-        super().setUp()
-        self.parent_count = Comment.objects.filter_parents_by_object(self.post_1).count()
-        self.all_count = Comment.objects.all().count()
-
-    def increase_count(self, parent=False):
-        if parent:
-            self.parent_count += 1
-        self.all_count += 1
-
-    def comment_count_test(self):
-        self.assertEqual(Comment.objects.filter_parents_by_object(self.post_1).count(), self.parent_count)
-        self.assertEqual(Comment.objects.all().count(), self.all_count)
-
-    def test_get_profile_model(self):
-        # missing settings attrs
-        patch.object(settings, 'PROFILE_APP_NAME', None).start()
-        profile = get_profile_model()
-        self.assertIsNone(profile)
-
-        # providing wrong attribute value, an exception is raised
-        patch.object(settings, 'PROFILE_APP_NAME', 'wrong').start()
-        self.assertRaises(LookupError, get_profile_model)
-
-        # attribute value is None
-        patch.object(settings, 'PROFILE_APP_NAME', None).start()
-        profile = get_profile_model()
-        self.assertIsNone(profile)
-
-        # success
-        patch.object(settings, 'PROFILE_APP_NAME', 'user_profile').start()
-        profile = get_profile_model()
-        self.assertIsNotNone(profile)
-
-    def test_get_user_fields(self):
-        fields = get_user_fields()
-        self.assertEqual(fields, ('id', 'username', 'email', 'profile'))
-
-        mocked_hasattr = patch('comment.api.serializers.hasattr').start()
-        mocked_hasattr.return_value = True
-        fields = get_user_fields()
-        self.assertEqual(fields, ('id', 'username', 'email', 'profile', 'logentry'))
-
-    def test_user_serializer(self):
-        # PROFILE_MODEL_NAME not provided
-        patch.object(settings, 'PROFILE_MODEL_NAME', None).start()
-        profile = UserSerializerDAB.get_profile(self.user_1)
-        self.assertIsNone(profile)
-
-        # PROFILE_MODEL_NAME is wrong
-        patch.object(settings, 'PROFILE_MODEL_NAME', 'wrong').start()
-        profile = UserSerializerDAB.get_profile(self.user_1)
-        self.assertIsNone(profile)
-
-        # success
-        patch.object(settings, 'PROFILE_MODEL_NAME', 'userprofile').start()
-        profile = UserSerializerDAB.get_profile(self.user_1)
-        self.assertIsNotNone(profile)
-
-    def test_comment_create_serializer(self):
-        self.assertEqual(self.parent_count, 3)
-        self.assertEqual(self.all_count, 8)
-
-        factory = RequestFactory()
-        request = factory.get('/')
-        request.user = self.user_1
-        data = {
-            'model_obj': self.post_1,
-            'parent_comment': None,
-            'request': request
-        }
-        settings.COMMENT_ALLOW_ANONYMOUS = False
 
-        serializer = CommentCreateSerializer(context=data)
-        self.assertIsNone(serializer.fields.get('email'))
-        comment = serializer.create(validated_data={'content': 'test'})
-        self.increase_count(parent=True)
-        self.comment_count_test()
-        self.assertIsNotNone(comment)
+class APIToggleFollowTest(APIBaseTest):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.comment_toggle_follow = cls.create_comment(cls.content_object_1)
+        cls.app_name = cls.comment_toggle_follow._meta.app_label
+        cls.model_name = cls.comment_toggle_follow.__class__.__name__
+        cls.model_id = cls.comment_toggle_follow.id
 
-        # get parent
-        parent_id = serializer.get_parent(comment)
-        self.assertIsNone(parent_id)
+    def get_url(self):
+        params = [f'app_name={self.app_name}', f'model_name={self.model_name}', f'model_id={self.model_id}']
+        return f'/api/comments/toggle-subscription/?{"&".join(params)}'
 
-        # get replies
-        replies = serializer.get_replies(comment)
-        reply_count = serializer.get_reply_count(comment)
-        self.assertEqual(replies, [])
-        self.assertEqual(reply_count, 0)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_unauthenticated_users(self):
+        self.client.logout()
+        response = self.client.post(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        data['parent_comment'] = self.comment_1
-        serializer = CommentCreateSerializer(context=data)
-        comment = serializer.create(validated_data={'content': 'test'})
-        self.increase_count()
-        self.comment_count_test()
-        self.assertIsNotNone(comment)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_system_is_not_enabled(self):
+        response = self.client.post(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        # get parent
-        parent_id = CommentCreateSerializer.get_parent(comment)
-        self.assertEqual(parent_id, data['parent_comment'].id)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_toggle_follow(self):
+        self.client.force_login(self.user_2)
+        self.assertIsNotNone(self.user_2.email)
+        response = self.client.post(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['app_name'], self.app_name)
+        self.assertEqual(response.data['model_name'], self.model_name)
+        self.assertEqual(response.data['model_id'], self.model_id)
+        self.assertTrue(response.data['following'])
 
-        replies = serializer.get_replies(self.comment_1)
-        reply_count = serializer.get_reply_count(self.comment_1)
-        self.assertIsNotNone(replies)
-        self.assertEqual(reply_count, 2)
 
-        replies = serializer.get_replies(self.comment_4)
-        reply_count = serializer.get_reply_count(self.comment_4)
-        self.assertEqual(replies, [])
-        self.assertEqual(reply_count, 0)
+class APIGetSubscribersTest(APIBaseTest):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.comment_get_followers = cls.create_comment(cls.content_object_1)
+        cls.app_name = cls.comment_get_followers._meta.app_label
+        cls.model_name = cls.comment_get_followers.__class__.__name__
+        cls.model_id = cls.comment_get_followers.id
 
-        # test anonymous commenting
-        from django.contrib.auth.models import AnonymousUser
-        request.user = AnonymousUser()
-        settings.COMMENT_ALLOW_ANONYMOUS = True
-        serializer = CommentCreateSerializer(context=data)
-
-        self.assertIsNotNone(serializer.fields['email'])
-        comment = serializer.create(validated_data={
-            'content': 'anonymous posting',
-            'email': 'abc@abc.com'
-        })
-        # no creation occurs until comment is verified
-        self.comment_count_test()
-        self.assertIsNotNone(comment)
+    def get_url(self):
+        params = [f'app_name={self.app_name}', f'model_name={self.model_name}', f'model_id={self.model_id}']
+        return f'/api/comments/subscribers/?{"&".join(params)}'
 
-    def test_passing_context_to_serializer(self):
-        serializer = CommentSerializer(self.comment_1)
-        self.assertFalse(serializer.fields['content'].read_only)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_unauthenticated_users(self):
+        self.client.logout()
+        response = self.client.get(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        serializer = CommentSerializer(self.comment_1, context={'reaction_update': True})
-        self.assertTrue(serializer.fields['content'].read_only)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_system_is_not_enabled(self):
+        response = self.client.get(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        serializer = CommentSerializer(self.comment_1, context={'flag_update': True})
-        self.assertTrue(serializer.fields['content'].read_only)
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_only_moderators_can_get_followers(self):
+        self.client.force_login(self.moderator)
+        response = self.client.get(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['app_name'], self.app_name)
+        self.assertEqual(response.data['model_name'], self.model_name)
+        self.assertEqual(response.data['model_id'], self.model_id)
+        # creator of comment, follow their comment automatically
+        self.assertEqual(list(response.data['followers']), [self.comment_get_followers.email])
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_normal_users_cannot_get_followers(self):
+        self.client.force_login(self.user_1)
+        self.assertFalse(is_comment_moderator(self.user_1))
+        response = self.client.get(self.get_url())
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
diff --git a/comment/tests/test_internationalization.py b/comment/tests/test_internationalization.py
index 7f188fc..9bb09bf 100644
--- a/comment/tests/test_internationalization.py
+++ b/comment/tests/test_internationalization.py
@@ -5,7 +5,7 @@
 from comment.tests.base import BaseCommentTest
 
 
-class InternationationalizationTest(BaseCommentTest):
+class InternationalizationTest(BaseCommentTest):
     """Testing values are not necessarily returned from a view functions"""
 
     @classmethod
diff --git a/comment/tests/test_migrations.py b/comment/tests/test_migrations.py
index 3e95df9..d52a450 100644
--- a/comment/tests/test_migrations.py
+++ b/comment/tests/test_migrations.py
@@ -1,5 +1,3 @@
-from comment.conf import settings
-from comment.signals import adjust_flagged_comments
 from comment.tests.base import BaseCommentMigrationTest
 
 
diff --git a/comment/tests/test_mixins.py b/comment/tests/test_mixins.py
index fdb4151..19c80ba 100644
--- a/comment/tests/test_mixins.py
+++ b/comment/tests/test_mixins.py
@@ -150,7 +150,7 @@ def test_flag_enabled_permission(self, _):
         self.assertEqual(response.status_code, 200)
 
 
-class CanSetFlagMixin(BaseCommentMixinTest):
+class CanSetFlagMixinTest(BaseCommentMixinTest):
     def setUp(self):
         super().setUp()
         self.client.force_login(self.user_1)
@@ -189,3 +189,25 @@ def test_moderator_can_change_flag_state(self):
         self.client.force_login(self.moderator)
         response = self.client.post(self.url, data=self.data, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
         self.assertEqual(response.status_code, 200)
+
+
+class CanSubscribeMixinTest(BaseCommentMixinTest):
+    def setUp(self):
+        super().setUp()
+        self.toggle_follow_url = self.get_url(
+            reverse('comment:toggle-subscription'), app_name='comment', model_name='comment', model_id=self.comment.id
+        )
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_user_cannot_subscribe(self):
+        self.client.force_login(self.user_1)
+        self.assertFalse(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertEqual(response.status_code, 403)
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_user_can_subscribe(self):
+        self.client.force_login(self.user_1)
+        self.assertTrue(settings.COMMENT_ALLOW_SUBSCRIPTION)
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertEqual(response.status_code, 200)
diff --git a/comment/tests/test_models.py b/comment/tests/test_models.py
deleted file mode 100644
index a73d982..0000000
--- a/comment/tests/test_models.py
+++ /dev/null
@@ -1,502 +0,0 @@
-from time import sleep
-from unittest.mock import patch
-
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-from django.utils import timezone
-
-from comment.conf import settings
-from comment.models import Comment, FlagInstance, ReactionInstance
-from comment.tests.base import BaseCommentManagerTest, BaseCommentTest, BaseCommentFlagTest
-
-
-class CommentModelTest(BaseCommentManagerTest):
-    def test_can_create_comment(self):
-        parent_comment = self.create_comment(self.content_object_1)
-        self.assertIsNotNone(parent_comment)
-        self.assertEqual(str(parent_comment), f'comment by {parent_comment.user}: {parent_comment.content[:20]}')
-        self.assertEqual(repr(parent_comment), f'comment by {parent_comment.user}: {parent_comment.content[:20]}')
-        self.assertTrue(parent_comment.is_parent)
-        self.assertEqual(parent_comment.replies().count(), 0)
-        self.assertIsNotNone(parent_comment.urlhash)
-
-        child_comment = self.create_comment(self.content_object_1, parent=parent_comment)
-        self.assertIsNotNone(child_comment)
-        self.assertEqual(str(child_comment), f'reply by {child_comment.user}: {child_comment.content[:20]}')
-        self.assertEqual(repr(child_comment), f'reply by {child_comment.user}: {child_comment.content[:20]}')
-        self.assertFalse(child_comment.is_parent)
-        self.assertEqual(parent_comment.replies().count(), 1)
-        self.assertIsNotNone(child_comment.urlhash)
-
-    def test_is_edited(self):
-        comment = self.create_comment(self.content_object_1)
-        self.assertFalse(comment.is_edited)
-        comment.content = 'updated'
-        sleep(1)
-        comment.save()
-        self.assertTrue(comment.is_edited)
-
-    def test_is_edited_for_anonymous_comment(self):
-        comment = self.create_anonymous_comment(posted=timezone.now() - timezone.timedelta(days=1))
-        self.assertFalse(comment.is_edited)
-
-    def test_replies_method(self):
-        self.assertEqual(self.parent_comment_2.replies().count(), 3)
-
-        settings.COMMENT_FLAGS_ALLOWED = 1
-        reply = self.parent_comment_2.replies().first()
-        self.create_flag_instance(self.user_1, reply)
-        self.create_flag_instance(self.user_2, reply)
-        # default replies hide flagged comment
-        self.assertEqual(self.parent_comment_2.replies().count(), 2)
-        self.assertEqual(self.parent_comment_2.replies(include_flagged=True).count(), 3)
-
-    @patch('comment.models.comments.hasattr')
-    def test_is_flagged_property(self, mocked_hasattr):
-        comment = self.create_comment(self.content_object_2)
-        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
-        self.assertFalse(comment.is_flagged)
-
-        comment.flag.state = comment.flag.FLAGGED
-        self.assertTrue(comment.is_flagged)
-
-        settings.COMMENT_FLAGS_ALLOWED = 0
-        self.assertFalse(comment.is_flagged)
-
-        mocked_hasattr.return_value = False
-        self.assertFalse(comment.is_flagged)
-
-    @patch('comment.models.comments.hasattr')
-    def test_has_flagged_state(self, mocked_hasattr):
-        comment = self.create_comment(self.content_object_2)
-        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
-        self.assertFalse(comment.has_flagged_state)
-
-        comment.flag.state = comment.flag.FLAGGED
-        self.assertTrue(comment.has_flagged_state)
-
-        mocked_hasattr.return_value = False
-        self.assertFalse(comment.has_flagged_state)
-
-    @patch('comment.models.comments.hasattr')
-    def test_has_rejected_state(self, mocked_hasattr):
-        comment = self.create_comment(self.content_object_2)
-        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
-        self.assertFalse(comment.has_rejected_state)
-
-        comment.flag.state = comment.flag.REJECTED
-        comment.flag.save()
-        self.assertTrue(comment.has_rejected_state)
-
-        mocked_hasattr.return_value = False
-        self.assertFalse(comment.has_rejected_state)
-
-    @patch('comment.models.comments.hasattr')
-    def test_has_resolved_state(self, mocked_hasattr):
-        comment = self.create_comment(self.content_object_2)
-        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
-        self.assertFalse(comment.has_resolved_state)
-
-        comment.flag.state = comment.flag.RESOLVED
-        comment.flag.save()
-        self.assertTrue(comment.has_resolved_state)
-
-        mocked_hasattr.return_value = False
-        self.assertFalse(comment.has_resolved_state)
-
-    @patch('comment.managers.CommentManager.generate_urlhash')
-    def test_urlhash_is_unique(self, mocked_generate_urlhash):
-        mocked_generate_urlhash.side_effect = ['first_urlhash', 'first_urlhash', 'second_urlhash']
-        first_comment = self.create_comment(self.content_object_1)
-        self.assertEqual(first_comment.urlhash, 'first_urlhash')
-        mocked_generate_urlhash.assert_called_once()
-        second_comment = self.create_comment(self.content_object_1)
-        self.assertEqual(second_comment.urlhash, 'second_urlhash')
-        self.assertEqual(mocked_generate_urlhash.call_count, 3)
-
-    def test_comment_email(self):
-        comment = self.parent_comment_1
-        self.assertEqual(comment.email, comment.user.email)
-
-    def test_get_url(self):
-        from comment.tests.base import RequestFactory
-
-        factory = RequestFactory()
-        request = factory.get('/')
-        request.user = self.user_1
-        attr = 'COMMENT_PER_PAGE'
-        comment = self.parent_comment_3
-
-        # no pagination(parent comment 3, 2, 1 belong to the same content_object_1)
-        patch.object(settings, attr, 0).start()
-        comment_url = comment.content_object.get_absolute_url() + '#' + comment.urlhash
-
-        self.assertEqual(comment_url, comment.get_url(request))
-
-        # with pagination
-        patch.object(settings, attr, 3).start()
-        # comment on first page
-        self.assertEqual(comment_url, comment.get_url(request))
-
-        # comment on the second page
-        comment = self.parent_comment_1
-        comment_url = comment.content_object.get_absolute_url() + '?page=2' + '#' + comment.urlhash
-        self.assertEqual(comment_url, comment.get_url(request))
-
-
-class CommentModelManagerTest(BaseCommentManagerTest):
-
-    def test_retrieve_all_parent_comments(self):
-        # for all objects of a content type
-        all_comments = Comment.objects.all().count()
-        self.assertEqual(all_comments, 10)
-        parent_comments = Comment.objects.all_parents().count()
-        self.assertEqual(parent_comments, 5)
-
-    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 1)
-    def test_filtering_flagged_comment(self):
-        comment = self.parent_comment_1
-        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
-        self.create_flag_instance(self.user_1, comment)
-        self.create_flag_instance(self.user_2, comment)
-        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment - 1)
-
-        # if COMMENT_SHOW_FLAGGED is enabled
-        settings.COMMENT_SHOW_FLAGGED = True
-        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
-        settings.COMMENT_SHOW_FLAGGED = False
-
-    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 0)
-    def test_filtering_comment_when_flag_not_enabled(self):
-        comment = self.parent_comment_1
-        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
-        self.create_flag_instance(self.user_1, comment)
-        self.create_flag_instance(self.user_2, comment)
-        comment.flag.refresh_from_db()
-        self.assertEqual(comment.flag.count, 2)
-        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
-
-    def test_all_comments_by_object(self):
-        # all comment for a particular content type
-        init_count = self.post_1.comments.count()
-        self.assertEqual(init_count, 6)
-
-        settings.COMMENT_FLAGS_ALLOWED = 1
-        settings.COMMENT_SHOW_FLAGGED = False
-        comment = self.post_1.comments.first()
-        self.create_flag_instance(self.user_1, comment)
-        self.create_flag_instance(self.user_2, comment)
-        # comments without flagged
-        count = Comment.objects.all_comments_by_object(self.post_1).count()
-        self.assertEqual(count, init_count - 1)
-
-        # comments with flagged
-        count = Comment.objects.all_comments_by_object(self.post_1, include_flagged=True).count()
-        self.assertEqual(count, init_count)
-
-    def test_filter_parents_by_object(self):
-        # parent comment only
-        init_count = self.post_2.comments.filter(parent=None).count()
-        self.assertEqual(init_count, 2)
-        settings.COMMENT_FLAGS_ALLOWED = 1
-        settings.COMMENT_SHOW_FLAGGED = False
-        comment = Comment.objects.filter_parents_by_object(self.post_2).first()
-        self.create_flag_instance(self.user_1, comment)
-        self.create_flag_instance(self.user_2, comment)
-        # comments without flagged
-        count = Comment.objects.filter_parents_by_object(self.post_2).count()
-        self.assertEqual(count, init_count - 1)
-
-        # comments with flagged
-        count = Comment.objects.filter_parents_by_object(self.post_2, include_flagged=True).count()
-        self.assertEqual(count, init_count)
-
-    def test_get_parent_comment(self):
-        # no parent_id passed from the url
-        self.assertIsNone(Comment.objects.get_parent_comment(''))
-        # no parent_id passed as 0
-        self.assertIsNone(Comment.objects.get_parent_comment('0'))
-        # no parent_id doesn't exist passed -> although this is highly unlikely as this will be handled by the mixin
-        # but is useful for admin interface if required
-        self.assertIsNone(Comment.objects.get_parent_comment(100))
-        parent_comment = Comment.objects.get_parent_comment(1)
-        self.assertIsNotNone(parent_comment)
-        self.assertEqual(parent_comment, self.parent_comment_1)
-
-
-class ReactionInstanceModelTest(BaseCommentManagerTest):
-    def setUp(self):
-        super().setUp()
-        self.user = self.user_1
-        self.comment = self.child_comment_1
-        self.LIKE = ReactionInstance.ReactionType.LIKE.name
-        self.DISLIKE = ReactionInstance.ReactionType.DISLIKE.name
-
-    def test_user_can_create_reaction(self):
-        """Test whether reaction instance can be created"""
-        instance = self.create_reaction_instance(self.user, self.comment, self.LIKE)
-        self.assertIsNotNone(instance)
-
-    def test_unique_togetherness_of_user_and_reaction_type(self):
-        """Test Integrity error is raised when one user is set to have more than 1 reaction type for the same comment"""
-        self.create_reaction_instance(self.user, self.comment, self.LIKE)
-        self.assertRaises(IntegrityError, self.create_reaction_instance, self.user, self.comment, self.DISLIKE)
-
-    def test_comment_property_likes_increase_and_decrease(self):
-        """Test decrease and increase on likes property with subsequent request."""
-        comment = self.child_comment_2
-        self.create_reaction_instance(self.user, comment, self.LIKE)
-        comment.refresh_from_db()
-        user = self.user_2
-        self.create_reaction_instance(user, comment, self.LIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.likes, 2)
-
-        self.set_reaction(user, comment, self.LIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.likes, 1)
-
-    def test_comment_property_dislikes_increase_and_decrease(self):
-        """Test decrease and increase on dislikes property with subsequent request."""
-        comment = self.child_comment_3
-        self.create_reaction_instance(self.user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        user = self.user_2
-        self.create_reaction_instance(user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 2)
-
-        # can't use create_reaction: one user can't create multiple reaction instances for a comment.
-        self.set_reaction(user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 1)
-
-    def test_set_reaction(self):
-        """Test set reactions increments the likes and dislikes property appropriately for subsequent calls"""
-        comment = self.comment
-        user = self.user_2
-        self.set_reaction(user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 1)
-        self.assertEqual(comment.likes, 0)
-
-        self.set_reaction(user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 0)
-        self.assertEqual(comment.likes, 0)
-
-        self.set_reaction(user, comment, self.LIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 0)
-        self.assertEqual(comment.likes, 1)
-
-        self.set_reaction(user, comment, self.DISLIKE)
-        comment.refresh_from_db()
-        self.assertEqual(comment.dislikes, 1)
-        self.assertEqual(comment.likes, 0)
-
-    def test_set_reaction_on_incorrect_reaction(self):
-        """Test ValidationError is raised when incorrect reaction type is passed"""
-        self.assertRaises(ValidationError, self.set_reaction, self.user_1, self.child_comment_5, 'likes')
-
-
-class ReactionModelTest(BaseCommentTest):
-    def setUp(self):
-        super().setUp()
-        self.comment_1 = self.create_comment(self.content_object_1)
-        self.comment_2 = self.create_comment(self.content_object_1)
-
-    def test_reaction_count(self):
-        self.assertEqual(self.comment_1.reaction.likes, 0)
-        self.assertEqual(self.comment_1.reaction.dislikes, 0)
-
-        self.comment_1.reaction.increase_reaction_count(ReactionInstance.ReactionType.LIKE.value)
-        self.comment_1.reaction.refresh_from_db()
-
-        self.assertEqual(self.comment_1.reaction.likes, 1)
-
-        self.comment_1.reaction.increase_reaction_count(ReactionInstance.ReactionType.DISLIKE.value)
-        self.comment_1.reaction.refresh_from_db()
-
-        self.assertEqual(self.comment_1.reaction.dislikes, 1)
-
-        self.comment_1.reaction.decrease_reaction_count(ReactionInstance.ReactionType.LIKE.value)
-        self.comment_1.reaction.refresh_from_db()
-
-        self.assertEqual(self.comment_1.reaction.likes, 0)
-
-        self.comment_1.reaction.decrease_reaction_count(ReactionInstance.ReactionType.DISLIKE.value)
-        self.comment_1.reaction.refresh_from_db()
-
-        self.assertEqual(self.comment_1.reaction.dislikes, 0)
-
-
-class ReactionInstanceManagerTest(BaseCommentTest):
-    def test_clean_reaction_type(self):
-        like = ReactionInstance.ReactionType.LIKE
-        # valid reaction type
-        reaction_type = ReactionInstance.objects.clean_reaction_type(like.name)
-        self.assertEqual(reaction_type, like.value)
-
-        # invalid reaction type
-        self.assertRaises(ValidationError, ReactionInstance.objects.clean_reaction_type, 1)
-
-        # invalid reaction type
-        self.assertRaises(ValidationError, ReactionInstance.objects.clean_reaction_type, 'likes')
-
-
-class FlagInstanceModelTest(BaseCommentFlagTest):
-    def test_create_flag(self):
-        data = self.flag_data
-        comment = self.comment
-        instance = self.create_flag_instance(self.user, comment, **data)
-        self.assertIsNotNone(instance)
-        comment.refresh_from_db()
-        self.assertEqual(comment.flag.count, 1)
-
-
-class FlagInstanceManagerTest(BaseCommentFlagTest):
-    def test_clean_reason_for_invalid_value(self):
-        data = self.flag_data.copy()
-        data.update({'reason': -1})
-        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **data)
-
-        data.update({'reason': 'abc'})
-        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **data)
-
-    def test_clean_for_invalid_values(self):
-        data = self.flag_data.copy()
-        user = self.user
-        comment = self.comment
-        # info can't be blank with the last reason(something else)
-        data.update({'reason': FlagInstance.objects.reason_values[-1]})
-        self.assertRaises(ValidationError, self.set_flag, user, comment, **data)
-
-        data.pop('reason')
-        self.assertRaises(ValidationError, self.set_flag, user, comment, **data)
-
-    def test_clean_ignores_info_for_all_reasons_except_last(self):
-        data = self.flag_data.copy()
-        info = 'Hi'
-        data['info'] = info
-        user = self.user
-        comment = self.comment
-        self.set_flag(user, comment, **data)
-        instance = FlagInstance.objects.get(user=user, flag=comment.flag)
-
-        self.assertIsNone(instance.info)
-
-        new_comment = self.create_comment(self.content_object_1)
-        data['reason'] = FlagInstance.objects.reason_values[-1]
-        self.set_flag(user, new_comment, **data)
-        instance = FlagInstance.objects.get(user=user, flag=new_comment.flag)
-
-        self.assertEqual(instance.info, info)
-
-    def test_set_flag_for_create(self):
-        self.assertTrue(self.set_flag(self.user, self.comment, **self.flag_data))
-
-    def test_set_flag_for_delete(self):
-        self.assertFalse(self.set_flag(self.user_2, self.comment_2))
-
-    def test_create_flag_twice(self):
-        self.assertTrue(self.set_flag(self.user, self.comment, **self.flag_data))
-        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **self.flag_data)
-
-    def test_un_flag_non_exist_flag(self):
-        # user try to un-flag comment that wasn't flagged yet
-        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment)
-
-
-class FlagModelTest(BaseCommentFlagTest):
-    def test_flag_count(self):
-        comment = self.comment
-        self.assertEqual(comment.flag.count, 0)
-        comment.flag.increase_count()
-        comment.refresh_from_db()
-        self.assertEqual(comment.flag.count, 1)
-        comment.flag.decrease_count()
-        comment.flag.refresh_from_db()
-        self.assertEqual(comment.flag.count, 0)
-
-    def test_comment_author(self):
-        comment = self.comment
-        self.assertEqual(comment.user, comment.flag.comment_author)
-
-    def test_is_flagged_enabled(self):
-        flag = self.create_comment(self.content_object_1).flag
-        settings.COMMENT_FLAGS_ALLOWED = 1
-        self.assertTrue(flag.is_flag_enabled)
-
-        settings.COMMENT_FLAGS_ALLOWED = 0
-        self.assertFalse(flag.is_flag_enabled)
-
-    @patch('comment.models.flags.Flag.get_clean_state')
-    def test_get_verbose_state(self, mocked_get_clean_state):
-        flag = self.create_comment(self.content_object_1).flag
-        mocked_get_clean_state.return_value = flag.FLAGGED
-        self.assertEqual(flag.get_verbose_state(flag.FLAGGED), flag.STATES_CHOICES[flag.FLAGGED-1][1])
-        mocked_get_clean_state.return_value = 100
-        self.assertIsNone(flag.get_verbose_state(100))
-
-    def test_get_clean_state(self):
-        flag = self.create_comment(self.content_object_1).flag
-        state = flag.get_clean_state(flag.FLAGGED)
-        self.assertEqual(state, 2)
-
-        # int not in existing states
-        self.assertRaises(ValidationError, flag.get_clean_state, 100)
-
-        # not int
-        self.assertRaises(ValidationError, flag.get_clean_state, 'Not int')
-
-        # None
-        self.assertRaises(ValidationError, flag.get_clean_state, None)
-
-    def test_toggle_state(self):
-        flag = self.create_comment(self.content_object_1).flag
-        self.assertIsNone(flag.moderator)
-        self.assertEqual(flag.state, flag.UNFLAGGED)
-
-        # toggle states occurs between rejected and resolved only
-        self.assertRaises(ValidationError, flag.toggle_state, flag.FLAGGED, self.moderator)
-
-        flag.toggle_state(flag.REJECTED, self.moderator)
-        self.assertEqual(flag.state, flag.REJECTED)
-        self.assertEqual(flag.moderator, self.moderator)
-
-        # passing RESOLVED state value for the first time
-        flag.toggle_state(flag.RESOLVED, self.moderator)
-        self.assertEqual(flag.state, flag.RESOLVED)
-
-        # passing RESOLVED state value for the second time
-        flag.toggle_state(flag.RESOLVED, self.moderator)
-        # state reset to FLAGGED
-        self.assertEqual(flag.state, flag.FLAGGED)
-
-    def test_toggle_flagged_state(self):
-        comment = self.create_comment(self.content_object_1)
-        flag = comment.flag
-        flag.toggle_flagged_state()
-        self.assertEqual(flag.state, flag.UNFLAGGED)
-
-        self.create_flag_instance(self.user_1, comment)
-        self.create_flag_instance(self.user_2, comment)
-        flag.refresh_from_db()
-        self.assertEqual(flag.count, 2)
-
-        # flagging is disabled => state won't change
-        settings.COMMENT_FLAGS_ALLOWED = 0
-        flag.toggle_flagged_state()
-        self.assertEqual(flag.state, flag.UNFLAGGED)
-
-        # flagging is enabled => state changes
-        settings.COMMENT_FLAGS_ALLOWED = 1
-        flag.toggle_flagged_state()
-        self.assertEqual(flag.state, flag.FLAGGED)
-
-        # increase allowed flags count => change the state to UNFLAGGED
-        settings.COMMENT_FLAGS_ALLOWED = 10
-        self.assertEqual(flag.count, 2)
-        flag.toggle_flagged_state()
-        self.assertEqual(flag.state, flag.UNFLAGGED)
diff --git a/comment/tests/test_models/__init__.py b/comment/tests/test_models/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comment/tests/test_models/test_comments.py b/comment/tests/test_models/test_comments.py
new file mode 100644
index 0000000..7b4e024
--- /dev/null
+++ b/comment/tests/test_models/test_comments.py
@@ -0,0 +1,222 @@
+from time import sleep
+from unittest.mock import patch
+
+from django.utils import timezone
+
+from comment.conf import settings
+from comment.models import Comment
+from comment.tests.base import BaseCommentManagerTest
+
+
+class CommentModelTest(BaseCommentManagerTest):
+    def test_can_create_comment(self):
+        parent_comment = self.create_comment(self.content_object_1)
+        self.assertIsNotNone(parent_comment)
+        self.assertEqual(str(parent_comment), f'comment by {parent_comment.user}: {parent_comment.content[:20]}')
+        self.assertEqual(repr(parent_comment), f'comment by {parent_comment.user}: {parent_comment.content[:20]}')
+        self.assertTrue(parent_comment.is_parent)
+        self.assertEqual(parent_comment.replies().count(), 0)
+        self.assertIsNotNone(parent_comment.urlhash)
+
+        child_comment = self.create_comment(self.content_object_1, parent=parent_comment)
+        self.assertIsNotNone(child_comment)
+        self.assertEqual(str(child_comment), f'reply by {child_comment.user}: {child_comment.content[:20]}')
+        self.assertEqual(repr(child_comment), f'reply by {child_comment.user}: {child_comment.content[:20]}')
+        self.assertFalse(child_comment.is_parent)
+        self.assertEqual(parent_comment.replies().count(), 1)
+        self.assertIsNotNone(child_comment.urlhash)
+
+    def test_is_edited(self):
+        comment = self.create_comment(self.content_object_1)
+        self.assertFalse(comment.is_edited)
+        comment.content = 'updated'
+        sleep(1)
+        comment.save()
+        self.assertTrue(comment.is_edited)
+
+    def test_is_edited_for_anonymous_comment(self):
+        comment = self.create_anonymous_comment(posted=timezone.now() - timezone.timedelta(days=1))
+        self.assertFalse(comment.is_edited)
+
+    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 1)
+    @patch.object(settings, 'COMMENT_SHOW_FLAGGED', False)
+    def test_replies_method(self):
+        self.assertEqual(self.parent_comment_2.replies().count(), 3)
+        reply = self.parent_comment_2.replies().first()
+        self.create_flag_instance(self.user_1, reply)
+        self.create_flag_instance(self.user_2, reply)
+        # default replies method hides flagged comment
+        self.assertEqual(self.parent_comment_2.replies().count(), 2)
+        self.assertEqual(self.parent_comment_2.replies(include_flagged=True).count(), 3)
+
+    @patch('comment.models.comments.hasattr')
+    def test_is_flagged_property(self, mocked_hasattr):
+        comment = self.create_comment(self.content_object_2)
+        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
+        self.assertFalse(comment.is_flagged)
+
+        comment.flag.state = comment.flag.FLAGGED
+        self.assertTrue(comment.is_flagged)
+
+        settings.COMMENT_FLAGS_ALLOWED = 0
+        self.assertFalse(comment.is_flagged)
+
+        mocked_hasattr.return_value = False
+        self.assertFalse(comment.is_flagged)
+
+    @patch('comment.models.comments.hasattr')
+    def test_has_flagged_state(self, mocked_hasattr):
+        comment = self.create_comment(self.content_object_2)
+        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
+        self.assertFalse(comment.has_flagged_state)
+
+        comment.flag.state = comment.flag.FLAGGED
+        self.assertTrue(comment.has_flagged_state)
+
+        mocked_hasattr.return_value = False
+        self.assertFalse(comment.has_flagged_state)
+
+    @patch('comment.models.comments.hasattr')
+    def test_has_rejected_state(self, mocked_hasattr):
+        comment = self.create_comment(self.content_object_2)
+        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
+        self.assertFalse(comment.has_rejected_state)
+
+        comment.flag.state = comment.flag.REJECTED
+        comment.flag.save()
+        self.assertTrue(comment.has_rejected_state)
+
+        mocked_hasattr.return_value = False
+        self.assertFalse(comment.has_rejected_state)
+
+    @patch('comment.models.comments.hasattr')
+    def test_has_resolved_state(self, mocked_hasattr):
+        comment = self.create_comment(self.content_object_2)
+        self.assertEqual(comment.flag.state, comment.flag.UNFLAGGED)
+        self.assertFalse(comment.has_resolved_state)
+
+        comment.flag.state = comment.flag.RESOLVED
+        comment.flag.save()
+        self.assertTrue(comment.has_resolved_state)
+
+        mocked_hasattr.return_value = False
+        self.assertFalse(comment.has_resolved_state)
+
+    @patch('comment.managers.CommentManager.generate_urlhash')
+    def test_urlhash_is_unique(self, mocked_generate_urlhash):
+        mocked_generate_urlhash.side_effect = ['first_urlhash', 'first_urlhash', 'second_urlhash']
+        first_comment = self.create_comment(self.content_object_1)
+        self.assertEqual(first_comment.urlhash, 'first_urlhash')
+        mocked_generate_urlhash.assert_called_once()
+        second_comment = self.create_comment(self.content_object_1)
+        self.assertEqual(second_comment.urlhash, 'second_urlhash')
+        self.assertEqual(mocked_generate_urlhash.call_count, 3)
+
+    def test_comment_email(self):
+        comment = self.parent_comment_1
+        self.assertEqual(comment.email, comment.user.email)
+
+    def test_get_url(self):
+        from comment.tests.base import RequestFactory
+
+        factory = RequestFactory()
+        request = factory.get('/')
+        request.user = self.user_1
+        attr = 'COMMENT_PER_PAGE'
+        comment = self.parent_comment_3
+
+        # no pagination(parent comment 3, 2, 1 belong to the same content_object_1)
+        patch.object(settings, attr, 0).start()
+        comment_url = comment.content_object.get_absolute_url() + '#' + comment.urlhash
+
+        self.assertEqual(comment_url, comment.get_url(request))
+
+        # with pagination
+        patch.object(settings, attr, 3).start()
+        # comment on first page
+        self.assertEqual(comment_url, comment.get_url(request))
+
+        # comment on the second page
+        comment = self.parent_comment_1
+        comment_url = comment.content_object.get_absolute_url() + '?page=2' + '#' + comment.urlhash
+        self.assertEqual(comment_url, comment.get_url(request))
+
+
+class CommentModelManagerTest(BaseCommentManagerTest):
+
+    def test_retrieve_all_parent_comments(self):
+        # for all objects of a content type
+        all_comments = Comment.objects.all().count()
+        self.assertEqual(all_comments, 10)
+        parent_comments = Comment.objects.all_parents().count()
+        self.assertEqual(parent_comments, 5)
+
+    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 1)
+    def test_filtering_flagged_comment(self):
+        comment = self.parent_comment_1
+        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
+        self.create_flag_instance(self.user_1, comment)
+        self.create_flag_instance(self.user_2, comment)
+        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment - 1)
+
+        # if COMMENT_SHOW_FLAGGED is enabled
+        settings.COMMENT_SHOW_FLAGGED = True
+        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
+        settings.COMMENT_SHOW_FLAGGED = False
+
+    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 0)
+    def test_filtering_comment_when_flag_not_enabled(self):
+        comment = self.parent_comment_1
+        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
+        self.create_flag_instance(self.user_1, comment)
+        self.create_flag_instance(self.user_2, comment)
+        comment.flag.refresh_from_db()
+        self.assertEqual(comment.flag.count, 2)
+        self.assertEqual(Comment.objects.all_exclude_flagged().count(), self.increment)
+
+    def test_all_comments_by_object(self):
+        # all comment for a particular content type
+        init_count = self.post_1.comments.count()
+        self.assertEqual(init_count, 6)
+
+        settings.COMMENT_FLAGS_ALLOWED = 1
+        settings.COMMENT_SHOW_FLAGGED = False
+        comment = self.post_1.comments.first()
+        self.create_flag_instance(self.user_1, comment)
+        self.create_flag_instance(self.user_2, comment)
+        # comments without flagged
+        count = Comment.objects.all_comments_by_object(self.post_1).count()
+        self.assertEqual(count, init_count - 1)
+
+        # comments with flagged
+        count = Comment.objects.all_comments_by_object(self.post_1, include_flagged=True).count()
+        self.assertEqual(count, init_count)
+
+    def test_filter_parents_by_object(self):
+        # parent comment only
+        init_count = self.post_2.comments.filter(parent=None).count()
+        self.assertEqual(init_count, 2)
+        settings.COMMENT_FLAGS_ALLOWED = 1
+        settings.COMMENT_SHOW_FLAGGED = False
+        comment = Comment.objects.filter_parents_by_object(self.post_2).first()
+        self.create_flag_instance(self.user_1, comment)
+        self.create_flag_instance(self.user_2, comment)
+        # comments without flagged
+        count = Comment.objects.filter_parents_by_object(self.post_2).count()
+        self.assertEqual(count, init_count - 1)
+
+        # comments with flagged
+        count = Comment.objects.filter_parents_by_object(self.post_2, include_flagged=True).count()
+        self.assertEqual(count, init_count)
+
+    def test_get_parent_comment(self):
+        # no parent_id passed from the url
+        self.assertIsNone(Comment.objects.get_parent_comment(''))
+        # no parent_id passed as 0
+        self.assertIsNone(Comment.objects.get_parent_comment('0'))
+        # no parent_id doesn't exist passed -> although this is highly unlikely as this will be handled by the mixin
+        # but is useful for admin interface if required
+        self.assertIsNone(Comment.objects.get_parent_comment(100))
+        parent_comment = Comment.objects.get_parent_comment(1)
+        self.assertIsNotNone(parent_comment)
+        self.assertEqual(parent_comment, self.parent_comment_1)
diff --git a/comment/tests/test_models/test_flags.py b/comment/tests/test_models/test_flags.py
new file mode 100644
index 0000000..8801de1
--- /dev/null
+++ b/comment/tests/test_models/test_flags.py
@@ -0,0 +1,164 @@
+from unittest.mock import patch
+
+from django.core.exceptions import ValidationError
+
+from comment.conf import settings
+from comment.models import FlagInstance
+from comment.tests.base import BaseCommentFlagTest
+
+
+class FlagInstanceModelTest(BaseCommentFlagTest):
+    def test_create_flag(self):
+        data = self.flag_data
+        comment = self.comment
+        instance = self.create_flag_instance(self.user, comment, **data)
+        self.assertIsNotNone(instance)
+        comment.refresh_from_db()
+        self.assertEqual(comment.flag.count, 1)
+
+
+class FlagInstanceManagerTest(BaseCommentFlagTest):
+    def test_clean_reason_for_invalid_value(self):
+        data = self.flag_data.copy()
+        data.update({'reason': -1})
+        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **data)
+
+        data.update({'reason': 'abc'})
+        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **data)
+
+    def test_clean_for_invalid_values(self):
+        data = self.flag_data.copy()
+        user = self.user
+        comment = self.comment
+        # info can't be blank with the last reason(something else)
+        data.update({'reason': FlagInstance.objects.reason_values[-1]})
+        self.assertRaises(ValidationError, self.set_flag, user, comment, **data)
+
+        data.pop('reason')
+        self.assertRaises(ValidationError, self.set_flag, user, comment, **data)
+
+    def test_clean_ignores_info_for_all_reasons_except_last(self):
+        data = self.flag_data.copy()
+        info = 'Hi'
+        data['info'] = info
+        user = self.user
+        comment = self.comment
+        self.set_flag(user, comment, **data)
+        instance = FlagInstance.objects.get(user=user, flag=comment.flag)
+
+        self.assertIsNone(instance.info)
+
+        new_comment = self.create_comment(self.content_object_1)
+        data['reason'] = FlagInstance.objects.reason_values[-1]
+        self.set_flag(user, new_comment, **data)
+        instance = FlagInstance.objects.get(user=user, flag=new_comment.flag)
+
+        self.assertEqual(instance.info, info)
+
+    def test_set_flag_for_create(self):
+        self.assertTrue(self.set_flag(self.user, self.comment, **self.flag_data))
+
+    def test_set_flag_for_delete(self):
+        self.assertFalse(self.set_flag(self.user_2, self.comment_2))
+
+    def test_create_flag_twice(self):
+        self.assertTrue(self.set_flag(self.user, self.comment, **self.flag_data))
+        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment, **self.flag_data)
+
+    def test_un_flag_non_exist_flag(self):
+        # user try to un-flag comment that wasn't flagged yet
+        self.assertRaises(ValidationError, self.set_flag, self.user, self.comment)
+
+
+class FlagModelTest(BaseCommentFlagTest):
+    def test_flag_count(self):
+        comment = self.comment
+        self.assertEqual(comment.flag.count, 0)
+        comment.flag.increase_count()
+        comment.refresh_from_db()
+        self.assertEqual(comment.flag.count, 1)
+        comment.flag.decrease_count()
+        comment.flag.refresh_from_db()
+        self.assertEqual(comment.flag.count, 0)
+
+    def test_comment_author(self):
+        comment = self.comment
+        self.assertEqual(comment.user, comment.flag.comment_author)
+
+    def test_is_flagged_enabled(self):
+        flag = self.create_comment(self.content_object_1).flag
+        settings.COMMENT_FLAGS_ALLOWED = 1
+        self.assertTrue(flag.is_flag_enabled)
+
+        settings.COMMENT_FLAGS_ALLOWED = 0
+        self.assertFalse(flag.is_flag_enabled)
+
+    @patch('comment.models.flags.Flag.get_clean_state')
+    def test_get_verbose_state(self, mocked_get_clean_state):
+        flag = self.create_comment(self.content_object_1).flag
+        mocked_get_clean_state.return_value = flag.FLAGGED
+        self.assertEqual(flag.get_verbose_state(flag.FLAGGED), flag.STATES_CHOICES[flag.FLAGGED-1][1])
+        mocked_get_clean_state.return_value = 100
+        self.assertIsNone(flag.get_verbose_state(100))
+
+    def test_get_clean_state(self):
+        flag = self.create_comment(self.content_object_1).flag
+        state = flag.get_clean_state(flag.FLAGGED)
+        self.assertEqual(state, 2)
+
+        # int not in existing states
+        self.assertRaises(ValidationError, flag.get_clean_state, 100)
+
+        # not int
+        self.assertRaises(ValidationError, flag.get_clean_state, 'Not int')
+
+        # None
+        self.assertRaises(ValidationError, flag.get_clean_state, None)
+
+    def test_toggle_state(self):
+        flag = self.create_comment(self.content_object_1).flag
+        self.assertIsNone(flag.moderator)
+        self.assertEqual(flag.state, flag.UNFLAGGED)
+
+        # toggle states occurs between rejected and resolved only
+        self.assertRaises(ValidationError, flag.toggle_state, flag.FLAGGED, self.moderator)
+
+        flag.toggle_state(flag.REJECTED, self.moderator)
+        self.assertEqual(flag.state, flag.REJECTED)
+        self.assertEqual(flag.moderator, self.moderator)
+
+        # passing RESOLVED state value for the first time
+        flag.toggle_state(flag.RESOLVED, self.moderator)
+        self.assertEqual(flag.state, flag.RESOLVED)
+
+        # passing RESOLVED state value for the second time
+        flag.toggle_state(flag.RESOLVED, self.moderator)
+        # state reset to FLAGGED
+        self.assertEqual(flag.state, flag.FLAGGED)
+
+    def test_toggle_flagged_state(self):
+        comment = self.create_comment(self.content_object_1)
+        flag = comment.flag
+        flag.toggle_flagged_state()
+        self.assertEqual(flag.state, flag.UNFLAGGED)
+
+        self.create_flag_instance(self.user_1, comment)
+        self.create_flag_instance(self.user_2, comment)
+        flag.refresh_from_db()
+        self.assertEqual(flag.count, 2)
+
+        # flagging is disabled => state won't change
+        settings.COMMENT_FLAGS_ALLOWED = 0
+        flag.toggle_flagged_state()
+        self.assertEqual(flag.state, flag.UNFLAGGED)
+
+        # flagging is enabled => state changes
+        settings.COMMENT_FLAGS_ALLOWED = 1
+        flag.toggle_flagged_state()
+        self.assertEqual(flag.state, flag.FLAGGED)
+
+        # increase allowed flags count => change the state to UNFLAGGED
+        settings.COMMENT_FLAGS_ALLOWED = 10
+        self.assertEqual(flag.count, 2)
+        flag.toggle_flagged_state()
+        self.assertEqual(flag.state, flag.UNFLAGGED)
diff --git a/comment/tests/test_models/test_followers.py b/comment/tests/test_models/test_followers.py
new file mode 100644
index 0000000..0a11fad
--- /dev/null
+++ b/comment/tests/test_models/test_followers.py
@@ -0,0 +1,147 @@
+from unittest.mock import patch
+
+from django.contrib.contenttypes.models import ContentType
+
+from comment.conf import settings
+from comment.models import Follower
+from comment.tests.base import BaseCommentTest
+
+
+class FollowerModelTest(BaseCommentTest):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.comment_test_follow = cls.create_comment(cls.content_object_1)
+        cls.email = 't@t.com'
+        cls.follower = Follower.objects.create(
+            email=cls.email,
+            username='test',
+            content_object=cls.comment_test_follow
+        )
+
+    def test_can_create_entry(self):
+        self.assertIsNotNone(self.follower)
+
+    def test_string_value(self):
+        self.assertEqual(str(self.follower), f'{str(self.comment_test_follow)} followed by {self.email}')
+        self.assertEqual(repr(self.follower), f'{str(self.comment_test_follow)} followed by {self.email}')
+
+
+class FollowerManagerTest(BaseCommentTest):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.manager = Follower.objects
+        cls.follower_email = 'f1@t.com'
+        cls.unfollower_email = 'uf@t.com'
+        cls.comment_test_follow = cls.create_comment(cls.content_object_1)
+        cls.comment_without_email = cls.create_comment(cls.content_object_1, user=cls.user_without_email)
+        cls.follower = cls.manager.create(
+            email=cls.follower_email,
+            username='test',
+            content_object=cls.comment_test_follow
+        )
+
+    def test_is_following(self):
+        self.assertTrue(self.manager.is_following(self.follower_email, self.comment_test_follow))
+        self.assertFalse(self.manager.is_following(self.unfollower_email, self.comment_test_follow))
+
+    def test_follow_return_none_on_missing_email(self):
+        self.assertIsNone(self.manager.follow('', 'username', self.comment_test_follow))
+
+    def test_follow_return_none_if_email_is_already_follow(self):
+        self.assertTrue(self.manager.is_following(self.follower_email, self.comment_test_follow))
+        self.assertIsNone(self.manager.follow(self.follower_email, 'username', self.comment_test_follow))
+
+    def test_follow_create_follower_instance(self):
+        initial_count = self.manager.count()
+        follower = self.manager.follow(self.unfollower_email, 'username', self.comment_test_follow)
+        self.assertIsInstance(follower, self.manager.model)
+        self.assertEqual(self.manager.count(), initial_count + 1)
+
+    def test_unfollow_delete_follower_instance(self):
+        initial_count = self.manager.count()
+        self.assertTrue(self.manager.is_following(self.follower_email, self.comment_test_follow))
+        self.manager.unfollow(self.follower_email, self.comment_test_follow)
+        self.assertEqual(self.manager.count(), initial_count - 1)
+
+    def test_toggle_follow_return_false_on_missing_email(self):
+        email = None
+        result = self.manager.toggle_follow(email=email, username='test', model_object=self.comment_test_follow)
+        self.assertFalse(result)
+
+    def test_toggle_follow_for_follower(self):
+        """set the follower to unfollower and return false"""
+        self.assertTrue(self.manager.is_following(self.follower_email, self.comment_test_follow))
+        result = self.manager.toggle_follow(
+            email=self.follower_email,
+            username='test_user',
+            model_object=self.comment_test_follow
+        )
+        self.assertFalse(result)
+        self.assertFalse(self.manager.is_following(self.follower_email, self.comment_test_follow))
+
+    def test_toggle_follow_for_unfollower(self):
+        """set the unfollower to follower and return true"""
+        self.assertFalse(self.manager.is_following(self.unfollower_email, self.comment_test_follow))
+        result = self.manager.toggle_follow(
+            email=self.unfollower_email,
+            username='test_user',
+            model_object=self.comment_test_follow
+        )
+        self.assertTrue(result)
+        self.assertTrue(self.manager.is_following(self.unfollower_email, self.comment_test_follow))
+
+    def test_follow_parent_thread_for_comment_no_email(self):
+        self.assertFalse(self.comment_without_email.email)
+        self.assertFalse(self.manager.is_following(self.comment_without_email.email, self.comment_without_email))
+        self.manager.follow_parent_thread_for_comment(self.comment_without_email)
+        self.assertFalse(self.manager.is_following(self.comment_without_email.email, self.comment_without_email))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_follow_parent_thread_for_comment_child_comment(self):
+        child_comment = self.create_comment(self.content_object_1, user=self.user_2, parent=self.comment_without_email)
+
+        # the parent (thread) will not be followed on creating child comment
+        self.assertFalse(self.manager.is_following(child_comment.email, child_comment.content_object))
+        # the parent comment (thread) is not followed yet
+        self.assertFalse(self.manager.is_following(child_comment.email, self.comment_without_email))
+        # child comment cannot be followed
+        self.assertFalse(self.manager.is_following(child_comment.email, child_comment))
+
+        self.manager.follow_parent_thread_for_comment(child_comment)
+
+        # the parent (thread) will not be followed on creating child comment
+        self.assertFalse(self.manager.is_following(child_comment.email, child_comment.content_object))
+        # the parent is now followed
+        self.assertTrue(self.manager.is_following(child_comment.email, self.comment_without_email))
+        # child comment cannot be followed
+        self.assertFalse(self.manager.is_following(child_comment.email, child_comment))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_follow_parent_thread_for_comment_parent_comment(self):
+        parent_comment = self.create_comment(self.content_object_1, user=self.user_2)
+        # the parent (thread) is not followed yet
+        self.assertFalse(self.manager.is_following(parent_comment.email, parent_comment.content_object))
+        # parent comment is not followed yet
+        self.assertFalse(self.manager.is_following(parent_comment.email, parent_comment))
+
+        self.manager.follow_parent_thread_for_comment(parent_comment)
+
+        # the parent (thread) is now followed
+        self.assertTrue(self.manager.is_following(parent_comment.email, parent_comment.content_object))
+        # parent comment is now followed
+        self.assertTrue(self.manager.is_following(parent_comment.email, parent_comment))
+
+    def test_get_all_followers_for_model_object(self):
+        followers = self.manager.filter_for_model_object(self.comment_test_follow)
+        content_type = ContentType.objects.get_for_model(self.comment_test_follow)
+        self.assertNotEqual(followers.count(), 0)
+        self.assertEqual(
+            list(followers),
+            list(self.manager.filter(content_type=content_type, object_id=self.comment_test_follow.id))
+        )
+
+    def test_get_get_emails_for_model_object(self):
+        emails = self.manager.get_emails_for_model_object(self.comment_test_follow)
+        self.assertIn(self.comment_test_follow.email, emails)
diff --git a/comment/tests/test_models/test_reactions.py b/comment/tests/test_models/test_reactions.py
new file mode 100644
index 0000000..00d05c8
--- /dev/null
+++ b/comment/tests/test_models/test_reactions.py
@@ -0,0 +1,126 @@
+from django.core.exceptions import ValidationError
+from django.db import IntegrityError
+
+from comment.models import ReactionInstance
+from comment.tests.base import BaseCommentManagerTest, BaseCommentTest
+
+
+class ReactionInstanceModelTest(BaseCommentManagerTest):
+    def setUp(self):
+        super().setUp()
+        self.user = self.user_1
+        self.comment = self.child_comment_1
+        self.LIKE = ReactionInstance.ReactionType.LIKE.name
+        self.DISLIKE = ReactionInstance.ReactionType.DISLIKE.name
+
+    def test_user_can_create_reaction(self):
+        """Test whether reaction instance can be created"""
+        instance = self.create_reaction_instance(self.user, self.comment, self.LIKE)
+        self.assertIsNotNone(instance)
+
+    def test_unique_togetherness_of_user_and_reaction_type(self):
+        """Test Integrity error is raised when one user is set to have more than 1 reaction type for the same comment"""
+        self.create_reaction_instance(self.user, self.comment, self.LIKE)
+        self.assertRaises(IntegrityError, self.create_reaction_instance, self.user, self.comment, self.DISLIKE)
+
+    def test_comment_property_likes_increase_and_decrease(self):
+        """Test decrease and increase on likes property with subsequent request."""
+        comment = self.child_comment_2
+        self.create_reaction_instance(self.user, comment, self.LIKE)
+        comment.refresh_from_db()
+        user = self.user_2
+        self.create_reaction_instance(user, comment, self.LIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.likes, 2)
+
+        self.set_reaction(user, comment, self.LIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.likes, 1)
+
+    def test_comment_property_dislikes_increase_and_decrease(self):
+        """Test decrease and increase on dislikes property with subsequent request."""
+        comment = self.child_comment_3
+        self.create_reaction_instance(self.user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        user = self.user_2
+        self.create_reaction_instance(user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 2)
+
+        # can't use create_reaction: one user can't create multiple reaction instances for a comment.
+        self.set_reaction(user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 1)
+
+    def test_set_reaction(self):
+        """Test set reactions increments the likes and dislikes property appropriately for subsequent calls"""
+        comment = self.comment
+        user = self.user_2
+        self.set_reaction(user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 1)
+        self.assertEqual(comment.likes, 0)
+
+        self.set_reaction(user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 0)
+        self.assertEqual(comment.likes, 0)
+
+        self.set_reaction(user, comment, self.LIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 0)
+        self.assertEqual(comment.likes, 1)
+
+        self.set_reaction(user, comment, self.DISLIKE)
+        comment.refresh_from_db()
+        self.assertEqual(comment.dislikes, 1)
+        self.assertEqual(comment.likes, 0)
+
+    def test_set_reaction_on_incorrect_reaction(self):
+        """Test ValidationError is raised when incorrect reaction type is passed"""
+        self.assertRaises(ValidationError, self.set_reaction, self.user_1, self.child_comment_5, 'likes')
+
+
+class ReactionModelTest(BaseCommentTest):
+    def setUp(self):
+        super().setUp()
+        self.comment_1 = self.create_comment(self.content_object_1)
+        self.comment_2 = self.create_comment(self.content_object_1)
+
+    def test_reaction_count(self):
+        self.assertEqual(self.comment_1.reaction.likes, 0)
+        self.assertEqual(self.comment_1.reaction.dislikes, 0)
+
+        self.comment_1.reaction.increase_reaction_count(ReactionInstance.ReactionType.LIKE.value)
+        self.comment_1.reaction.refresh_from_db()
+
+        self.assertEqual(self.comment_1.reaction.likes, 1)
+
+        self.comment_1.reaction.increase_reaction_count(ReactionInstance.ReactionType.DISLIKE.value)
+        self.comment_1.reaction.refresh_from_db()
+
+        self.assertEqual(self.comment_1.reaction.dislikes, 1)
+
+        self.comment_1.reaction.decrease_reaction_count(ReactionInstance.ReactionType.LIKE.value)
+        self.comment_1.reaction.refresh_from_db()
+
+        self.assertEqual(self.comment_1.reaction.likes, 0)
+
+        self.comment_1.reaction.decrease_reaction_count(ReactionInstance.ReactionType.DISLIKE.value)
+        self.comment_1.reaction.refresh_from_db()
+
+        self.assertEqual(self.comment_1.reaction.dislikes, 0)
+
+
+class ReactionInstanceManagerTest(BaseCommentTest):
+    def test_clean_reaction_type(self):
+        like = ReactionInstance.ReactionType.LIKE
+        # valid reaction type
+        reaction_type = ReactionInstance.objects.clean_reaction_type(like.name)
+        self.assertEqual(reaction_type, like.value)
+
+        # invalid reaction type
+        self.assertRaises(ValidationError, ReactionInstance.objects.clean_reaction_type, 1)
+
+        # invalid reaction type
+        self.assertRaises(ValidationError, ReactionInstance.objects.clean_reaction_type, 'likes')
diff --git a/comment/tests/test_service.py b/comment/tests/test_service.py
new file mode 100644
index 0000000..1db3b9a
--- /dev/null
+++ b/comment/tests/test_service.py
@@ -0,0 +1,191 @@
+from unittest.mock import patch
+
+from django.core import mail
+from django.core.mail import EmailMultiAlternatives
+from django.shortcuts import reverse
+
+from comment.conf import settings
+from comment.tests.test_utils import BaseAnonymousCommentTest
+from comment.service.email import DABEmailService
+from comment.messages import EmailInfo
+from comment.models import Follower
+from comment.utils import get_username_for_comment
+
+
+@patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', True)
+@patch.object(settings, 'COMMENT_FROM_EMAIL', 'no-reply@domain')
+@patch.object(settings, 'COMMENT_CONTACT_EMAIL', 'contact@domain')
+class TestDABEmailService(BaseAnonymousCommentTest):
+    def setUp(self):
+        super().setUp()
+        self.email_service = DABEmailService(self.comment_obj, self.request)
+        self.confirmation_url = reverse('comment:confirm-comment', args=[self.key])
+        self.confirmation_url_drf = f'/api/comments/confirm/{self.key}/'
+        self.contact_email = settings.COMMENT_CONTACT_EMAIL
+        self.receivers = []
+        self.sender = settings.COMMENT_FROM_EMAIL
+        self.site = self.email_service.get_msg_context()['site']
+        self.content_object_url = f'http://{self.site.domain}{self.comment_obj.content_object.get_absolute_url()}'
+
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.child_comment = cls.create_comment(cls.content_object_1, parent=cls.comment_1)
+
+    def email_contents_test(self, contents, *args):
+        for arg in args:
+            self.assertTrue(arg in contents)
+        self.assertTrue(self.site.name in contents)
+        self.assertTrue(self.content_object_url in contents)
+
+    def email_metadata_test(self, email):
+        self.assertEqual(email.from_email, self.sender)
+        self.assertEqual(email.to, self.receivers)
+        if self.email_service.is_html:
+            self.assertEqual(email.alternatives[0][1], 'text/html')
+        else:
+            self.assertEqual(email.alternatives, [])
+
+    def test_can_create_service(self):
+        self.assertIsNotNone(self.email_service)
+
+    def test_get_msg_context(self):
+        context = self.email_service.get_msg_context(test='test')
+        self.assertEqual(context['comment'], self.comment_obj)
+        self.assertEqual(context['contact'], settings.COMMENT_CONTACT_EMAIL)
+        self.assertEqual(context['test'], 'test')
+        self.assertIn('site', context.keys())
+
+    def test_get_message_for_txt(self):
+        subject = 'test subject'
+        body = 'test body'
+        msg = self.email_service.get_message(subject, body, self.receivers)
+        self.assertIsInstance(msg, EmailMultiAlternatives)
+        self.assertEqual(msg.to, self.receivers)
+        self.assertEqual(msg.alternatives, [])
+
+    def test_get_message_for_html(self):
+        subject = 'test subject'
+        body = 'test body'
+        html = 'html_test'
+        msg = self.email_service.get_message(subject, body, self.receivers, html_msg=html)
+        self.assertIsInstance(msg, EmailMultiAlternatives)
+        self.assertEqual(msg.to, self.receivers)
+        self.assertEqual(msg.alternatives, [(html, 'text/html')])
+
+    @patch.object(settings, 'COMMENT_SEND_HTML_EMAIL', False)
+    def test_get_message_templates_text_only(self):
+        email_service = DABEmailService(self.comment_obj, self.request)
+        context = self.email_service.get_msg_context()
+        text_template = 'comment/anonymous/confirmation_request.txt'
+        html_template = 'comment/anonymous/confirmation_request.html'
+        text_msg, html_msg = email_service.get_message_templates(text_template, html_template, context)
+        self.assertFalse(email_service.is_html)
+        self.assertIsNotNone(text_msg)
+        self.assertIsNone(html_msg)
+
+    def test_get_message_templates_with_html(self):
+        context = self.email_service.get_msg_context()
+        text_template = 'comment/anonymous/confirmation_request.txt'
+        html_template = 'comment/anonymous/confirmation_request.html'
+        text_msg, html_msg = self.email_service.get_message_templates(text_template, html_template, context)
+        self.assertTrue(self.email_service.is_html)
+        self.assertIsNotNone(text_msg)
+        self.assertIsNotNone(html_msg)
+
+    def test_send_messages(self):
+        self.receivers = ['test@test']
+        messages = [
+            self.email_service.get_message('test subject', 'test body', ['test@test'], html_msg='test msg')
+            for _ in range(100)
+        ]
+        self.assertEqual(len(mail.outbox), 0)
+        self.email_service.send_messages(messages)
+        self.assertNotEqual(len(mail.outbox), 100)
+        self.assertTrue(self.email_service.thread.is_alive())
+        self.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 100)
+
+    def test_send_confirmation_request_django(self):
+        self.email_service.send_confirmation_request()
+        self.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
+        sent_email = mail.outbox[0]
+        self.assertIsInstance(sent_email, EmailMultiAlternatives)
+        self.assertEqual(sent_email.subject, EmailInfo.CONFIRMATION_SUBJECT)
+        self.email_contents_test(
+            sent_email.body, self.confirmation_url, self.comment_obj.content, self.contact_email
+        )
+        self.receivers = [self.comment_obj.to_dict()['email']]
+        self.email_metadata_test(sent_email)
+
+    def test_send_confirmation_request_api(self):
+        self.email_service.send_confirmation_request(api=True)
+        self.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
+        sent_email = mail.outbox[0]
+        self.assertIsInstance(sent_email, EmailMultiAlternatives)
+        self.email_contents_test(
+            sent_email.body, self.confirmation_url_drf, self.comment_obj.content, self.contact_email
+        )
+        self.assertEqual(sent_email.subject, EmailInfo.CONFIRMATION_SUBJECT)
+        self.receivers = [self.comment_obj.to_dict()['email']]
+        self.email_metadata_test(sent_email)
+
+    def test_get_thread_for_parent_comment(self):
+        """The content type (Post, Picture...) is the parent thread of a parent comment"""
+        self.assertTrue(self.email_service.comment.is_parent)
+        thread = self.email_service.get_thread()
+        self.assertIs(thread, self.email_service.comment.content_object)
+        self.assertIsInstance(thread, self.email_service.comment.content_object.__class__)
+
+    def test_get_thread_for_child_comment(self):
+        """The parent comment is the parent thread of a child comment"""
+        self.assertFalse(self.child_comment.is_parent)
+        email_service = DABEmailService(self.child_comment, self.request)
+        self.assertFalse(email_service.comment.is_parent)
+        thread = email_service.get_thread()
+        self.assertIsNot(thread, email_service.comment.content_object)
+        self.assertIs(thread, email_service.comment.parent)
+
+    def test_get_thread_name_for_parent_comment(self):
+        self.assertTrue(self.email_service.comment.is_parent)
+        thread_name = self.email_service.get_thread_name()
+        self.assertEqual(thread_name, str(self.email_service.comment.content_object))
+
+    def test_get_thread_name_for_child_comment(self):
+        email_service = DABEmailService(self.child_comment, self.request)
+        self.assertFalse(email_service.comment.is_parent)
+        thread_name = email_service.get_thread_name()
+        self.assertEqual(thread_name, str(email_service.comment.parent).split(':')[0])
+
+    def test_send_notification_to_followers_return_none(self):
+        """return None if the thread has no followers"""
+        followers = Follower.objects.filter_for_model_object(
+            self.comment_obj.content_object).exclude(email=self.comment_obj.email)
+        self.assertEqual(followers.count(), 0)
+        result = self.email_service.send_notification_to_followers()
+        self.assertIsNone(result)
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_send_notification_to_followers(self):
+        Follower.objects.follow('any@test.com', 'test_user', self.comment_obj.content_object)
+        followers = Follower.objects.filter_for_model_object(
+            self.comment_obj.content_object).exclude(email=self.comment_obj.email)
+        self.assertEqual(followers.count(), 1)
+
+        self.email_service.send_notification_to_followers()
+        self.email_service.thread.join()
+
+        self.assertEqual(len(mail.outbox), 1)
+        sent_email = mail.outbox[0]
+        self.assertIsInstance(sent_email, EmailMultiAlternatives)
+        username = get_username_for_comment(self.comment_obj)
+        thread_name = str(self.comment_obj.content_object)
+        self.email_contents_test(sent_email.body, username, self.comment_obj.content)
+        self.assertEqual(
+            sent_email.subject,
+            EmailInfo.NOTIFICATION_SUBJECT.format(username=username, thread_name=thread_name)
+        )
+        self.receivers = [followers.first().email]
+        self.email_metadata_test(sent_email)
diff --git a/comment/tests/test_template_tags.py b/comment/tests/test_template_tags.py
index 2b6fe54..0dee0b1 100644
--- a/comment/tests/test_template_tags.py
+++ b/comment/tests/test_template_tags.py
@@ -139,16 +139,22 @@ def test_render_content(self):
         self.assertEqual(result['text_1'], ' '.join(content_words[:5]))
         self.assertEqual(result['text_2'], ' '.join(content_words[5:]))
 
-    def test_get_username_for_comment(self):
+    @patch.object(settings, 'COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME', True)
+    def test_get_username_for_comment_use_email_first_part_enabled(self):
         comment = self.create_comment(self.content_object_1, user=self.user_1)
         anonymous_comment = self.create_anonymous_comment()
 
         self.assertEqual(get_username_for_comment(comment), comment.user.username)
-        self.assertEqual(get_username_for_comment(anonymous_comment), settings.COMMENT_ANONYMOUS_USERNAME)
-
-        patch.object(settings, 'COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME', True).start()
         self.assertEqual(get_username_for_comment(anonymous_comment), anonymous_comment.email.split('@')[0])
 
+    @patch.object(settings, 'COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME', False)
+    def test_get_username_for_comment_use_email_first_part_disabled(self):
+        comment = self.create_comment(self.content_object_1, user=self.user_1)
+        anonymous_comment = self.create_anonymous_comment()
+
+        self.assertEqual(get_username_for_comment(comment), comment.user.username)
+        self.assertEqual(get_username_for_comment(anonymous_comment), settings.COMMENT_ANONYMOUS_USERNAME)
+
 
 class ReactionTemplateTagsTest(BaseTemplateTagsTest):
     def setUp(self):
diff --git a/comment/tests/test_utils.py b/comment/tests/test_utils.py
index 90846c4..73f7f5d 100644
--- a/comment/tests/test_utils.py
+++ b/comment/tests/test_utils.py
@@ -2,17 +2,14 @@
 from unittest.mock import patch
 
 from django.utils import timezone
-from django.core import signing, mail
-from django.contrib.sites.shortcuts import get_current_site
+from django.core import signing
 from django.contrib.auth.models import AnonymousUser
-from django.shortcuts import reverse
 
 from comment.conf import settings
-from comment.messages import EmailInfo
 from comment.utils import (
     get_model_obj, has_valid_profile, get_comment_context_data, id_generator, get_comment_from_key,
-    get_user_for_request, send_email_confirmation_request, process_anonymous_commenting, CommentFailReason,
-    get_gravatar_img, get_profile_instance, is_comment_moderator, is_comment_admin)
+    get_user_for_request, CommentFailReason,
+    get_gravatar_img, get_profile_instance, is_comment_moderator, is_comment_admin, get_username_for_comment)
 from comment.tests.base import BaseCommentUtilsTest, Comment, RequestFactory
 
 
@@ -149,6 +146,17 @@ def test_user_for_request(self):
         request.user = self.user_1
         self.assertEqual(get_user_for_request(request), self.user_1)
 
+    def test_get_username_for_comment(self):
+        comment = self.create_comment(self.content_object_1, user=self.user_1)
+        anonymous_comment = self.create_anonymous_comment()
+
+        self.assertEqual(get_username_for_comment(comment), comment.user.username)
+        patch.object(settings, 'COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME', False).start()
+        self.assertEqual(get_username_for_comment(anonymous_comment), settings.COMMENT_ANONYMOUS_USERNAME)
+
+        patch.object(settings, 'COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME', True).start()
+        self.assertEqual(get_username_for_comment(anonymous_comment), anonymous_comment.email.split('@')[0])
+
 
 class BaseAnonymousCommentTest(BaseCommentUtilsTest):
     def setUp(self):
@@ -169,10 +177,9 @@ def setUp(self):
 
         self.key = signing.dumps(self.comment_obj.to_dict(), compress=True)
         self.request = _factory.get('/')
-        self.site = get_current_site(self.request)
 
 
-class TestGetCommentFromKey(BaseAnonymousCommentTest, BaseCommentUtilsTest):
+class TestGetCommentFromKey(BaseAnonymousCommentTest):
     def test_bad_signature(self):
         key = self.key + 'invalid'
         response = get_comment_from_key(key)
@@ -231,110 +238,6 @@ def test_success(self):
         self.assertEqual(response.is_valid, True)
         self.assertEqual(response.why_invalid, None)
         self.assertIsInstance(response.obj, Comment)
-        # comment is saved
-        self.assertIsNotNone(response.obj.id)
-        self.assertEqual(response.obj.posted, self.time_posted)
-
-
-@patch.object(settings, 'COMMENT_ALLOW_ANONYMOUS', True)
-class TestSendEmailConfirmationRequest(BaseAnonymousCommentTest, BaseCommentUtilsTest):
-    def setUp(self):
-        super().setUp()
-        settings.COMMENT_CONTACT_EMAIL = 'contact@domain'
-        settings.COMMENT_FROM_EMAIL = 'no-reply@domain'
-        self.len_mailbox = len(mail.outbox)
-        self.confirmation_url = reverse('comment:confirm-comment', args=[self.key])
-        self.confirmation_url_drf = f'/api/comments/confirm/{self.key}/'
-        self.contact_email = settings.COMMENT_CONTACT_EMAIL
-        self.receivers = [self.comment_obj.to_dict()['email']]
-        self.sender = settings.COMMENT_FROM_EMAIL
-        self.subject = EmailInfo.SUBJECT
-        self.content_object_url = f'http://{self.site.domain}{self.comment_obj.content_object.get_absolute_url()}'
-
-    def email_contents_test(self, contents, api=False):
-        if not api:
-            confirmation_url = self.confirmation_url
-        else:
-            confirmation_url = self.confirmation_url_drf
-
-        # message context contains comment content, confirmation url, contact email, site name,\
-        # content object's absolute url.
-        self.assertEqual(True, self.comment_obj.content in contents)
-        self.assertEqual(True, confirmation_url in contents)
-        self.assertEqual(True, self.contact_email in contents)
-        self.assertEqual(True, self.site.name in contents)
-        self.assertEqual(True, self.content_object_url in contents)
-
-    def email_metadata_test(self, email, html=False):
-        self.assertEqual(email.from_email, self.sender)
-        self.assertEqual(email.to, self.receivers)
-        self.assertEqual(email.subject, self.subject)
-        if html:
-            self.assertEqual(email.alternatives[0][1], 'text/html')
-        else:
-            self.assertEqual(email.alternatives, [])
-
-    @patch.object(settings, 'COMMENT_SEND_HTML_EMAIL', False)
-    def test_sending_only_text_template_with_django(self):
-        receiver = self.comment_obj.to_dict()['email']
-        len_mailbox = self.len_mailbox
-        response = send_email_confirmation_request(self.comment_obj, receiver, self.key, self.site)
-        self.assertIsNone(response)
-        self.assertEqual(len(mail.outbox), len_mailbox + 1)
-        sent_email = mail.outbox[0]
-
-        self.email_metadata_test(sent_email)
-        self.email_contents_test(sent_email.body)
-
-    @patch.object(settings, 'COMMENT_SEND_HTML_EMAIL', False)
-    def test_sending_only_text_template_with_drf(self):
-        receiver = self.comment_obj.to_dict()['email']
-        len_mailbox = self.len_mailbox
-        response = send_email_confirmation_request(self.comment_obj, receiver, self.key, self.site, api=True)
-        self.assertIsNone(response)
-        self.assertEqual(len(mail.outbox), len_mailbox + 1)
-        sent_email = mail.outbox[0]
-
-        self.email_metadata_test(sent_email)
-        self.email_contents_test(sent_email.body, api=True)
-
-    @patch.object(settings, 'COMMENT_SEND_HTML_EMAIL', True)
-    def test_sending_both_text_and_html_template_with_django(self):
-        receiver = self.comment_obj.to_dict()['email']
-        len_mailbox = self.len_mailbox
-        response = send_email_confirmation_request(self.comment_obj, receiver, self.key, self.site)
-        self.assertIsNone(response)
-        self.assertEqual(len(mail.outbox), len_mailbox + 1)
-        sent_email = mail.outbox[0]
-
-        self.email_metadata_test(sent_email, html=True)
-        self.email_contents_test(sent_email.body)
-
-    @patch.object(settings, 'COMMENT_SEND_HTML_EMAIL', True)
-    def test_sending_both_text_and_html_template_with_drf(self):
-        receiver = self.comment_obj.to_dict()['email']
-        len_mailbox = self.len_mailbox
-        response = send_email_confirmation_request(self.comment_obj, receiver, self.key, self.site, api=True)
-        self.assertIsNone(response)
-        self.assertEqual(len(mail.outbox), len_mailbox + 1)
-        sent_email = mail.outbox[0]
-
-        self.email_metadata_test(sent_email, html=True)
-        self.email_contents_test(sent_email.body, api=True)
-
-
-class TestProcessAnonymousCommenting(BaseAnonymousCommentTest, BaseCommentUtilsTest):
-    def setUp(self):
-        super().setUp()
-        self.request.user = AnonymousUser()
-
-    def test_for_django(self):
-        response = process_anonymous_commenting(self.request, self.comment_obj)
-        self.assertEqual(EmailInfo.CONFIRMATION_SENT, response)
-
-    def test_for_drf(self):
-        response = process_anonymous_commenting(self.request, self.comment_obj, api=True)
-        self.assertEqual(EmailInfo.CONFIRMATION_SENT, response)
 
 
 class UtilsTest(TestCase):
diff --git a/comment/tests/test_version.py b/comment/tests/test_version.py
index 5a1e71b..5b2e9db 100644
--- a/comment/tests/test_version.py
+++ b/comment/tests/test_version.py
@@ -1,15 +1,37 @@
-from unittest.mock import patch, mock_open
+from unittest import skipIf
+from unittest.mock import patch
 
 from django.test import TestCase
 
-from comment import _get_version
+from comment import __version__, _get_version, check_release
 
 
-class TestGetVersion(TestCase):
-    def test_when_versions_startswith_v(self):
-        with patch('builtins.open', mock_open(read_data='v2.0.0'), create=True):
-            self.assertEqual('2.0.0', _get_version())
+SKIP = False
+try:
+    MANIFEST_VERSION = _get_version()
+except FileNotFoundError:
+    SKIP = True
 
-    def test_when_versions_does_not_startwith_v(self):
-        with patch('builtins.open', mock_open(read_data='2.0.0'), create=True):
-            self.assertEqual('2.0.0', _get_version())
+
+class TestVersion(TestCase):
+
+    @skipIf(SKIP, 'Test skipped: development purpose only')
+    def test_get_version(self):
+        self.assertEqual(_get_version(), MANIFEST_VERSION)
+
+    @skipIf(SKIP, 'Test skipped: development purpose only')
+    def test_manifest_matches_init_version(self):
+        self.assertEqual(__version__, MANIFEST_VERSION)
+
+    @patch('comment._get_version', side_effect=[FileNotFoundError])
+    def test_check_release_file_not_found(self, mocked_get_version):
+        self.assertIsNone(check_release())
+        mocked_get_version.assert_called_once()
+
+    @skipIf(SKIP, 'Test skipped: development purpose only')
+    @patch('comment.__version__', return_value='not_match')
+    def test_check_release_raise_assertion_error_when_versions_does_not_match(self, _):
+        self.assertRaises(AssertionError, check_release)
+
+    def test_check_release_exit_with_no_error(self):
+        self.assertIsNone(check_release())
diff --git a/comment/tests/test_views/__init__.py b/comment/tests/test_views/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comment/tests/test_views.py b/comment/tests/test_views/test_comments.py
similarity index 54%
rename from comment/tests/test_views.py
rename to comment/tests/test_views/test_comments.py
index 3a5fb24..daf9f1d 100644
--- a/comment/tests/test_views.py
+++ b/comment/tests/test_views/test_comments.py
@@ -1,14 +1,19 @@
 from unittest.mock import patch
 
+from django.contrib.auth.models import AnonymousUser
+from django.test import RequestFactory
+from django.utils import timezone
+from django.core import signing, mail
 from django.urls import reverse
 from rest_framework import status
 from django.contrib import messages
 
 from comment.conf import settings
-from comment.models import Comment
-from comment.messages import EmailInfo, ReactionInfo, FlagInfo, EmailError
-from comment.tests.base import BaseCommentTest, BaseCommentFlagTest, BaseCommentViewTest
-from comment.tests.test_utils import BaseAnonymousCommentTest, AnonymousUser, timezone, signing
+from comment.models import Comment, Follower
+from comment.messages import EmailInfo, EmailError
+from comment.tests.base import BaseCommentViewTest
+from comment.tests.test_utils import BaseAnonymousCommentTest
+from comment.views import ConfirmComment
 
 
 class CommentViewTestCase(BaseCommentViewTest):
@@ -38,11 +43,11 @@ def comment_count_test(self):
         self.assertEqual(Comment.objects.all_parents().count(), self.parent_comments)
         self.assertEqual(Comment.objects.all().count(), self.all_comments)
 
-    def test_create_parent_and_child_comment(self):
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_create_parent_comment(self):
         self.assertEqual(self.all_comments, 0)
         self.assertEqual(self.parent_comments, 0)
 
-        # parent comment
         url = self.get_create_url()
         response = self.client.post(url, data=self.data)
         self.assertEqual(response.status_code, 200)
@@ -56,8 +61,16 @@ def test_create_parent_and_child_comment(self):
         self.increase_count(parent=True)
         self.comment_count_test()
 
-        # child comment
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_create_child_comment(self):
+        self.assertEqual(self.all_comments, 0)
+        self.assertEqual(self.parent_comments, 0)
+
+        url = self.get_create_url()
         data = self.data.copy()
+        parent_comment = self.create_comment(self.post_1)
+        self.increase_count(parent=True)
+        self.comment_count_test()
         data['parent_id'] = parent_comment.id
         response = self.client.post(url, data=data)
 
@@ -72,6 +85,16 @@ def test_create_parent_and_child_comment(self):
         self.increase_count()
         self.comment_count_test()
 
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_send_notification_to_thread_followers_on_create_comment(self):
+        Follower.objects.follow('te@te.com', 'test_user', self.post_1)
+        self.assertEqual(len(mail.outbox), 0)
+        url = self.get_create_url()
+        response = self.client.post(url, data=self.data)
+        self.assertEqual(response.status_code, 200)
+        response.context['view'].email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
+
     def test_create_comment_non_ajax_request(self):
         response = self.client_non_ajax.post(self.get_create_url(), data=self.data)
         self.assertEqual(response.status_code, 400)
@@ -235,243 +258,7 @@ def test_cannot_delete_comment_by_different_user(self):
         self.response_fails_test(response)
 
 
-class SetReactionViewTest(BaseCommentViewTest):
-    def setUp(self):
-        super().setUp()
-        self.comment = self.create_comment(self.content_object_1)
-
-    @staticmethod
-    def get_reaction_url(obj_id, action):
-        return reverse('comment:react', kwargs={
-            'pk': obj_id,
-            'reaction': action
-        })
-
-    def test_set_reaction_for_authenticated_users(self):
-        """Test whether users can create/change reactions using view"""
-        _url = self.get_reaction_url(self.comment.id, 'like')
-        response = self.client.post(_url)
-        data = {
-            'status': 0,
-            'likes': 1,
-            'dislikes': 0,
-            'msg': ReactionInfo.UPDATED_SUCCESS
-        }
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        server_response = response.json()
-        self.assertDictEqual(server_response, data)
-        self.assertTextTranslated(server_response['msg'], _url)
-
-    def test_set_reaction_for_old_comments(self):
-        """Test backward compatibility for this update"""
-        _url = self.get_reaction_url(self.comment.id, 'like')
-        # delete the reaction object
-        self.comment.reaction.delete()
-        response = self.client.post(_url)
-        data = {
-            'status': 0,
-            'likes': 1,
-            'dislikes': 0,
-            'msg': ReactionInfo.UPDATED_SUCCESS
-        }
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        server_response = response.json()
-        self.assertDictEqual(server_response, data)
-        self.assertTextTranslated(server_response['msg'], _url)
-
-    def test_set_reaction_for_unauthenticated_users(self):
-        """Test whether unauthenticated users can create/change reactions using view"""
-        _url = self.get_reaction_url(self.comment.id, 'dislike')
-        self.client.logout()
-        response = self.client.post(_url)
-        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
-        self.assertEqual(response.url, '{}?next={}'.format(settings.LOGIN_URL, _url))
-
-    def test_get_request(self):
-        """Test whether GET requests are allowed or not"""
-        _url = self.get_reaction_url(self.comment.id, 'like')
-        response = self.client.get(_url)
-        self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
-
-    def test_non_ajax_requests(self):
-        """Test response if non AJAX requests are sent"""
-        _url = self.get_reaction_url(self.comment.id, 'like')
-        response = self.client_non_ajax.post(_url)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_incorrect_comment_id(self):
-        """Test response when an incorrect comment id is passed"""
-        _url = self.get_reaction_url(102_876, 'like')
-        response = self.client.post(_url)
-        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-
-    def test_incorrect_reaction(self):
-        """Test response when incorrect reaction is passed"""
-        _url = self.get_reaction_url(self.comment.id, 'likes')
-        response = self.client.post(_url)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-        # test incorrect type
-        _url = self.get_reaction_url(self.comment.id, 1)
-        response = self.client.post(_url)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-
-class SetFlagViewTest(BaseCommentFlagTest):
-    def setUp(self):
-        super().setUp()
-        self.flag_data.update({
-            'info': ''
-            })
-        self.response_data = {
-            'status': 1
-        }
-
-    def test_set_flag_for_flagging(self):
-        _url = self.get_url('comment:flag', self.comment.id)
-        self.flag_data['reason'] = 1
-        response = self.client.post(_url, data=self.flag_data)
-
-        response_data = {
-            'status': 0,
-            'flag': 1,
-            'msg': FlagInfo.FLAGGED_SUCCESS
-        }
-        self.assertEqual(response.status_code, 200)
-        server_response = response.json()
-        self.assertDictEqual(server_response, response_data)
-        self.assertTextTranslated(server_response['msg'], _url)
-
-    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 0)
-    def test_set_flag_when_flagging_not_enabled(self):
-        settings.COMMENT_FLAGS_ALLOWED = 0
-        _url = self.get_url('comment:flag', self.comment.id)
-        self.flag_data['reason'] = 1
-        response = self.client.post(_url, data=self.flag_data)
-        self.assertEqual(response.status_code, 403)
-
-    def test_set_flag_for_flagging_old_comments(self):
-        """Test backward compatibility for this update"""
-        _url = self.get_url('comment:flag', self.comment.id)
-        data = self.flag_data.copy()
-        # delete the flag object
-        self.comment.flag.delete()
-        response = self.client.post(_url, data=data)
-        response_data = {
-            'status': 0,
-            'flag': 1,
-            'msg': FlagInfo.FLAGGED_SUCCESS
-        }
-        self.assertEqual(response.status_code, 200)
-        server_response = response.json()
-        self.assertDictEqual(server_response, response_data)
-        self.assertTextTranslated(server_response['msg'], _url)
-
-    def test_set_flag_for_unflagging(self):
-        # un-flag => no reason is passed and the comment must be already flagged by the user
-        _url = self.get_url('comment:flag', self.comment_2.id)
-        data = {}
-        response = self.client.post(_url, data=data)
-        response_data = {
-            'status': 0,
-            'msg': FlagInfo.UNFLAGGED_SUCCESS
-        }
-        self.assertEqual(response.status_code, 200)
-        server_response = response.json()
-        self.assertDictEqual(server_response, response_data)
-        self.assertTextTranslated(server_response['msg'], _url)
-
-    def test_set_flag_for_unauthenticated_user(self):
-        """Test whether unauthenticated user can create/delete flag using view"""
-        url = self.get_url('comment:flag', self.comment.id).replace('?', '')
-        self.client.logout()
-        response = self.client.post(url, data=self.flag_data)
-        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
-        self.assertEqual(response.url, '{}?next={}'.format(settings.LOGIN_URL, url))
-
-    def test_get_request(self):
-        """Test whether GET requests are allowed or not"""
-        url = self.get_url('comment:flag', self.comment.id)
-        response = self.client.get(url, data=self.flag_data)
-        self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
-
-    def test_non_ajax_requests(self):
-        """Test response if non AJAX requests are sent"""
-        url = self.get_url('comment:flag', self.comment.id)
-        response = self.client_non_ajax.post(url, data=self.flag_data)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
-    def test_incorrect_comment_id(self):
-        """Test response when an incorrect comment id is passed"""
-        url = self.get_url('comment:flag', 102_876)
-        response = self.client.post(url, data=self.flag_data)
-        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-
-    def test_incorrect_reason(self):
-        """Test response when incorrect reason is passed"""
-        url = self.get_url('comment:flag', self.comment.id)
-        data = self.flag_data
-        reason = -1
-        data.update({'reason': reason})
-        response = self.client.post(url, data=data)
-        self.assertEqual(response.status_code, 200)
-
-
-class ChangeFlagStateViewTest(BaseCommentFlagTest):
-    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 1)
-    def setUp(self):
-        super().setUp()
-        self.data = {
-            'state': self.comment.flag.REJECTED
-        }
-        self.create_flag_instance(self.user_1, self.comment, **self.flag_data)
-        self.create_flag_instance(self.user_2, self.comment, **self.flag_data)
-
-    def test_change_flag_state_for_unflagged_comment(self):
-        self.comment.flag.toggle_flagged_state()
-        self.assertFalse(self.comment.is_flagged)
-        self.client.force_login(self.moderator)
-        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
-        response = self.client.post(self.get_url('comment:flag-change-state', self.comment.id), data=self.data)
-        self.assertEqual(response.status_code, 400)
-
-    def test_change_flag_state_by_not_permitted_user(self):
-        self.assertTrue(self.comment.is_flagged)
-        self.client.force_login(self.user_1)
-        self.assertEqual(int(self.client.session['_auth_user_id']), self.user_1.id)
-        response = self.client.post(self.get_url('comment:flag-change-state', self.comment.id), data=self.data)
-        self.assertEqual(response.status_code, 403)
-
-    def test_change_flag_state_with_wrong_state_value(self):
-        self.assertTrue(self.comment.is_flagged)
-        self.client.force_login(self.moderator)
-        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
-        self.assertEqual(self.comment.flag.state, self.comment.flag.FLAGGED)
-
-        # valid state is REJECTED and RESOLVED
-        self.data['state'] = self.comment.flag.UNFLAGGED
-        response = self.client.post(self.get_url('comment:flag-change-state', self.comment.id), data=self.data)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['state'], 0)
-        self.assertEqual(self.comment.flag.state, self.comment.flag.FLAGGED)
-
-    def test_change_flag_state_success(self):
-        self.assertTrue(self.comment.is_flagged)
-        self.client.force_login(self.moderator)
-        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
-        self.assertEqual(self.comment.flag.state, self.comment.flag.FLAGGED)
-
-        # valid state is REJECTED and RESOLVED
-        self.data['state'] = self.comment.flag.REJECTED
-        response = self.client.post(self.get_url('comment:flag-change-state', self.comment.id), data=self.data)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['state'], self.comment.flag.REJECTED)
-        self.comment.flag.refresh_from_db()
-        self.assertEqual(self.comment.flag.moderator, self.moderator)
-        self.assertEqual(self.comment.flag.state, self.comment.flag.REJECTED)
-
-
-class ConfirmCommentViewTest(BaseAnonymousCommentTest, BaseCommentTest):
+class ConfirmCommentViewTest(BaseAnonymousCommentTest):
     def setUp(self):
         super().setUp()
         # although this will work for authenticated users as well.
@@ -530,9 +317,26 @@ def test_comment_exists(self):
             self.assertEqual(r.message, EmailError.USED_VERIFICATION_LINK)
             self.assertTextTranslated(r.message, _url)
 
-    def test_success(self):
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', False)
+    def test_success_without_notification(self):
         response = self.client.get(self.get_url())
         comment = Comment.objects.get(email=self.comment_obj.email, posted=self.time_posted)
         self.assertEqual(Comment.objects.all().count(), self.init_count + 1)
         self.assertEqual(response.status_code, status.HTTP_302_FOUND)
         self.assertEqual(response.url, comment.get_url(self.request))
+
+    @patch.object(settings, 'COMMENT_ALLOW_SUBSCRIPTION', True)
+    def test_success_with_notification(self):
+        self.assertEqual(len(mail.outbox), 0)
+        Follower.objects.follow('t@r.com', 'test_user', self.post_1)
+        request = RequestFactory().get(self.get_url())
+        request.user = self.user_2
+        view = ConfirmComment()
+        response = view.get(request, key=self.key)
+        comment = Comment.objects.get(email=self.comment_obj.email, posted=self.time_posted)
+        self.assertEqual(Comment.objects.all().count(), self.init_count + 1)
+        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
+        self.assertEqual(response.url, comment.get_url(self.request))
+
+        view.email_service.thread.join()
+        self.assertEqual(len(mail.outbox), 1)
diff --git a/comment/tests/test_views/test_flags.py b/comment/tests/test_views/test_flags.py
new file mode 100644
index 0000000..8b2924d
--- /dev/null
+++ b/comment/tests/test_views/test_flags.py
@@ -0,0 +1,167 @@
+from unittest.mock import patch
+
+from rest_framework import status
+
+from comment.conf import settings
+from comment.messages import FlagInfo
+from comment.tests.base import BaseCommentFlagTest
+
+
+class SetFlagViewTest(BaseCommentFlagTest):
+    def setUp(self):
+        super().setUp()
+        self.flag_data.update({
+            'info': ''
+            })
+        self.response_data = {
+            'status': 1
+        }
+
+    def test_set_flag_for_flagging(self):
+        _url = self.get_url('comment:flag', self.comment.id)
+        self.flag_data['reason'] = 1
+        response = self.client.post(_url, data=self.flag_data)
+
+        response_data = {
+            'status': 0,
+            'flag': 1,
+            'msg': FlagInfo.FLAGGED_SUCCESS
+        }
+        self.assertEqual(response.status_code, 200)
+        server_response = response.json()
+        self.assertDictEqual(server_response, response_data)
+        self.assertTextTranslated(server_response['msg'], _url)
+
+    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 0)
+    def test_set_flag_when_flagging_not_enabled(self):
+        settings.COMMENT_FLAGS_ALLOWED = 0
+        _url = self.get_url('comment:flag', self.comment.id)
+        self.flag_data['reason'] = 1
+        response = self.client.post(_url, data=self.flag_data)
+        self.assertEqual(response.status_code, 403)
+
+    def test_set_flag_for_flagging_old_comments(self):
+        """Test backward compatibility for this update"""
+        _url = self.get_url('comment:flag', self.comment.id)
+        data = self.flag_data.copy()
+        # delete the flag object
+        self.comment.flag.delete()
+        response = self.client.post(_url, data=data)
+        response_data = {
+            'status': 0,
+            'flag': 1,
+            'msg': FlagInfo.FLAGGED_SUCCESS
+        }
+        self.assertEqual(response.status_code, 200)
+        server_response = response.json()
+        self.assertDictEqual(server_response, response_data)
+        self.assertTextTranslated(server_response['msg'], _url)
+
+    def test_set_flag_for_unflagging(self):
+        # un-flag => no reason is passed and the comment must be already flagged by the user
+        _url = self.get_url('comment:flag', self.comment_2.id)
+        data = {}
+        response = self.client.post(_url, data=data)
+        response_data = {
+            'status': 0,
+            'msg': FlagInfo.UNFLAGGED_SUCCESS
+        }
+        self.assertEqual(response.status_code, 200)
+        server_response = response.json()
+        self.assertDictEqual(server_response, response_data)
+        self.assertTextTranslated(server_response['msg'], _url)
+
+    def test_set_flag_for_unauthenticated_user(self):
+        """Test whether unauthenticated user can create/delete flag using view"""
+        url = self.get_url('comment:flag', self.comment.id).replace('?', '')
+        self.client.logout()
+        response = self.client.post(url, data=self.flag_data)
+        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
+        self.assertEqual(response.url, '{}?next={}'.format(settings.LOGIN_URL, url))
+
+    def test_get_request(self):
+        """Test whether GET requests are allowed or not"""
+        url = self.get_url('comment:flag', self.comment.id)
+        response = self.client.get(url, data=self.flag_data)
+        self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def test_non_ajax_requests(self):
+        """Test response if non AJAX requests are sent"""
+        url = self.get_url('comment:flag', self.comment.id)
+        response = self.client_non_ajax.post(url, data=self.flag_data)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_incorrect_comment_id(self):
+        """Test response when an incorrect comment id is passed"""
+        url = self.get_url('comment:flag', 102_876)
+        response = self.client.post(url, data=self.flag_data)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+    def test_incorrect_reason(self):
+        """Test response when incorrect reason is passed"""
+        url = self.get_url('comment:flag', self.comment.id)
+        data = self.flag_data
+        reason = -1
+        data.update({'reason': reason})
+        response = self.client.post(url, data=data)
+        self.assertEqual(response.status_code, 200)
+
+
+class ChangeFlagStateViewTest(BaseCommentFlagTest):
+    @patch.object(settings, 'COMMENT_FLAGS_ALLOWED', 1)
+    def setUp(self):
+        super().setUp()
+        self.data = {
+            'state': self.comment_for_change_state.flag.REJECTED
+        }
+        self.create_flag_instance(self.user_1, self.comment_for_change_state, **self.flag_data)
+        self.create_flag_instance(self.user_2, self.comment_for_change_state, **self.flag_data)
+
+    def test_change_flag_state_for_unflagged_comment(self):
+        comment = self.create_comment(self.content_object_1)
+        self.assertFalse(comment.is_flagged)
+        self.client.force_login(self.moderator)
+        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
+        response = self.client.post(self.get_url('comment:flag-change-state', comment.id), data=self.data)
+        self.assertEqual(response.status_code, 400)
+
+    def test_change_flag_state_by_not_permitted_user(self):
+        self.assertTrue(self.comment_for_change_state.is_flagged)
+        self.client.force_login(self.user_1)
+        self.assertEqual(int(self.client.session['_auth_user_id']), self.user_1.id)
+        response = self.client.post(
+            self.get_url('comment:flag-change-state', self.comment_for_change_state.id), data=self.data
+        )
+        self.assertEqual(response.status_code, 403)
+
+    def test_change_flag_state_with_wrong_state_value(self):
+        self.assertTrue(self.comment_for_change_state.is_flagged)
+        self.client.force_login(self.moderator)
+        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
+        self.assertEqual(self.comment_for_change_state.flag.state, self.comment_for_change_state.flag.FLAGGED)
+
+        # valid state is REJECTED and RESOLVED
+        self.data['state'] = self.comment_for_change_state.flag.UNFLAGGED
+        response = self.client.post(
+            self.get_url('comment:flag-change-state', self.comment_for_change_state.id), data=self.data
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()['state'], 0)
+        self.assertEqual(self.comment_for_change_state.flag.state, self.comment_for_change_state.flag.FLAGGED)
+
+    def test_change_flag_state_success(self):
+        self.assertTrue(self.comment_for_change_state.is_flagged)
+        self.client.force_login(self.moderator)
+        self.assertEqual(int(self.client.session['_auth_user_id']), self.moderator.id)
+        self.assertEqual(self.comment_for_change_state.flag.state, self.comment_for_change_state.flag.FLAGGED)
+
+        # valid state is REJECTED and RESOLVED
+        self.data['state'] = self.comment_for_change_state.flag.REJECTED
+        response = self.client.post(
+            self.get_url('comment:flag-change-state', self.comment_for_change_state.id), data=self.data
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()['state'], self.comment_for_change_state.flag.REJECTED)
+        self.comment_for_change_state.flag.refresh_from_db()
+        self.assertEqual(self.comment_for_change_state.flag.moderator, self.moderator)
+        self.assertEqual(self.comment_for_change_state.flag.state, self.comment_for_change_state.flag.REJECTED)
diff --git a/comment/tests/test_views/test_reactions.py b/comment/tests/test_views/test_reactions.py
new file mode 100644
index 0000000..d20b807
--- /dev/null
+++ b/comment/tests/test_views/test_reactions.py
@@ -0,0 +1,88 @@
+from django.urls import reverse
+from rest_framework import status
+
+from comment.tests.base import BaseCommentViewTest
+from comment.messages import ReactionInfo
+from comment.conf import settings
+
+
+class SetReactionViewTest(BaseCommentViewTest):
+    def setUp(self):
+        super().setUp()
+        self.comment = self.create_comment(self.content_object_1)
+
+    @staticmethod
+    def get_reaction_url(obj_id, action):
+        return reverse('comment:react', kwargs={
+            'pk': obj_id,
+            'reaction': action
+        })
+
+    def test_set_reaction_for_authenticated_users(self):
+        """Test whether users can create/change reactions using view"""
+        _url = self.get_reaction_url(self.comment.id, 'like')
+        response = self.client.post(_url)
+        data = {
+            'status': 0,
+            'likes': 1,
+            'dislikes': 0,
+            'msg': ReactionInfo.UPDATED_SUCCESS
+        }
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        server_response = response.json()
+        self.assertDictEqual(server_response, data)
+        self.assertTextTranslated(server_response['msg'], _url)
+
+    def test_set_reaction_for_old_comments(self):
+        """Test backward compatibility for this update"""
+        _url = self.get_reaction_url(self.comment.id, 'like')
+        # delete the reaction object
+        self.comment.reaction.delete()
+        response = self.client.post(_url)
+        data = {
+            'status': 0,
+            'likes': 1,
+            'dislikes': 0,
+            'msg': ReactionInfo.UPDATED_SUCCESS
+        }
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        server_response = response.json()
+        self.assertDictEqual(server_response, data)
+        self.assertTextTranslated(server_response['msg'], _url)
+
+    def test_set_reaction_for_unauthenticated_users(self):
+        """Test whether unauthenticated users can create/change reactions using view"""
+        _url = self.get_reaction_url(self.comment.id, 'dislike')
+        self.client.logout()
+        response = self.client.post(_url)
+        self.assertEqual(response.status_code, status.HTTP_302_FOUND)
+        self.assertEqual(response.url, '{}?next={}'.format(settings.LOGIN_URL, _url))
+
+    def test_get_request(self):
+        """Test whether GET requests are allowed or not"""
+        _url = self.get_reaction_url(self.comment.id, 'like')
+        response = self.client.get(_url)
+        self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def test_non_ajax_requests(self):
+        """Test response if non AJAX requests are sent"""
+        _url = self.get_reaction_url(self.comment.id, 'like')
+        response = self.client_non_ajax.post(_url)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_incorrect_comment_id(self):
+        """Test response when an incorrect comment id is passed"""
+        _url = self.get_reaction_url(102_876, 'like')
+        response = self.client.post(_url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+    def test_incorrect_reaction(self):
+        """Test response when incorrect reaction is passed"""
+        _url = self.get_reaction_url(self.comment.id, 'likes')
+        response = self.client.post(_url)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+        # test incorrect type
+        _url = self.get_reaction_url(self.comment.id, 1)
+        response = self.client.post(_url)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
diff --git a/comment/tests/test_views/test_subscription.py b/comment/tests/test_views/test_subscription.py
new file mode 100644
index 0000000..25ef45c
--- /dev/null
+++ b/comment/tests/test_views/test_subscription.py
@@ -0,0 +1,58 @@
+from django.urls import reverse
+
+from comment.tests.base import BaseCommentMixinTest
+from comment.views import BaseToggleFollowView
+from comment.messages import FollowError
+from comment.models import Follower
+
+
+class BaseToggleFollowViewTest(BaseCommentMixinTest):
+    def setUp(self):
+        super().setUp()
+        self.view = BaseToggleFollowView()
+        self.toggle_follow_url = self.get_url(
+            reverse('toggle-subscription'), app_name='comment', model_name='comment', model_id=self.comment.id
+        )
+
+    def test_assertion_error_on_missing_request_class(self):
+        self.assertRaises(AssertionError, self.view.get_response_class)
+
+    def test_success_on_providing_request_class(self):
+        self.view.response_class = 'test'
+        self.assertEqual(self.view.get_response_class(), self.view.response_class)
+
+    def test_email_required_to_follow_object(self):
+        self.client.force_login(self.user_without_email)
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json()['message'], FollowError.EMAIL_REQUIRED.format(model_object=self.comment))
+
+    def test_invalid_email(self):
+        data = {'email': 'invalid_email'}
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest', data=data)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json()['invalid_email'], [FollowError.EMAIL_INVALID])
+
+    def test_toggle_follow_for_valid_email(self):
+        self.client.force_login(self.user_without_email)
+        self.assertEqual(self.user_without_email.email, '')
+        data = {'email': 't@t.com'}
+        self.assertFalse(Follower.objects.is_following(data['email'], self.comment))
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest', data=data)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.json()['following'])
+        self.assertEqual(response.json()['model_id'], self.comment.id)
+        self.assertEqual(response.wsgi_request.user.email, data['email'])
+        self.assertEqual(response.wsgi_request.user, self.user_without_email)
+
+    def test_provide_email_for_user_has_already_email(self):
+        self.client.force_login(self.user_2)
+        self.assertEqual(self.user_2.email, 'test-2@acme.edu')
+        data = {'email': 't@t.com'}
+        self.assertFalse(Follower.objects.is_following(data['email'], self.comment))
+        response = self.client.post(self.toggle_follow_url, HTTP_X_REQUESTED_WITH='XMLHttpRequest', data=data)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.json()['following'])
+        self.assertEqual(response.json()['model_id'], self.comment.id)
+        self.assertNotEqual(self.user_2, data['email'])
+        self.assertEqual(response.wsgi_request.user, self.user_2)
diff --git a/comment/urls.py b/comment/urls.py
index 728d4f4..787ed46 100644
--- a/comment/urls.py
+++ b/comment/urls.py
@@ -5,7 +5,8 @@
 from comment import __version__
 from comment.views import (
     CreateComment, UpdateComment, DeleteComment, SetReaction, SetFlag, ChangeFlagState,
-    ConfirmComment)
+    ConfirmComment, ToggleFollowView
+)
 
 app_name = 'comment'
 
@@ -18,6 +19,7 @@
     path('<int:pk>/flag/', SetFlag.as_view(), name='flag'),
     path('<int:pk>/flag/state/change/', ChangeFlagState.as_view(), name='flag-change-state'),
     re_path(r'^confirm/(?P<key>[^/]+)/$', ConfirmComment.as_view(), name='confirm-comment'),
+    path('toggle-subscription/', ToggleFollowView.as_view(), name='toggle-subscription'),
     # javascript translations
     # The value returned by _get_version() must change when translations change.
     path(
diff --git a/comment/utils.py b/comment/utils.py
index 042ae46..553acfa 100644
--- a/comment/utils.py
+++ b/comment/utils.py
@@ -6,15 +6,11 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.shortcuts import reverse
-from django.template import loader
-from django.core.mail import EmailMultiAlternatives
 from django.core import signing
 from django.apps import apps
-from django.contrib.sites.shortcuts import get_current_site
 
 from comment.conf import settings
-from comment.messages import ErrorMessage, EmailInfo
+from comment.messages import ErrorMessage
 
 
 @unique
@@ -148,6 +144,7 @@ def get_comment_context_data(request, model_object=None):
         'allowed_flags': allowed_flags,
         'is_anonymous_allowed': is_anonymous_allowed,
         'is_translation_allowed': is_translation_allowed,
+        'is_subscription_allowed': settings.COMMENT_ALLOW_SUBSCRIPTION,
         'oauth': oauth
     }
 
@@ -156,51 +153,13 @@ def id_generator(prefix='', chars=string.ascii_lowercase, len_id=6, suffix=''):
     return prefix + ''.join(random.choice(chars) for _ in range(len_id)) + suffix
 
 
-def _send_mail(subject, body, sender, receivers,
-               fail_silently=False, html=None):
-    msg = EmailMultiAlternatives(subject, body, sender, receivers)
-    if html:
-        msg.attach_alternative(html, 'text/html')
-    msg.send(fail_silently)
-
-
-def send_email_confirmation_request(
-    comment, receiver, key, site,
-    text_template='comment/anonymous/confirmation_request.txt',
-    html_template='comment/anonymous/confirmation_request.html',
-    api=False
-):
-    """Send email requesting comment confirmation"""
-    subject = EmailInfo.SUBJECT
-    if api:
-        confirmation_url = f'/api/comments/confirm/{key}/'
-    else:
-        confirmation_url = reverse('comment:confirm-comment', args=[key])
-
-    msg_context = {
-        'comment': comment,
-        'confirmation_url': confirmation_url,
-        'contact': settings.COMMENT_CONTACT_EMAIL,
-        'site': site
-    }
-    text_msg_template = loader.get_template(text_template)
-    text_msg = text_msg_template.render(msg_context)
-    if settings.COMMENT_SEND_HTML_EMAIL:
-        html_msg_template = loader.get_template(html_template)
-        html_msg = html_msg_template.render(msg_context)
-    else:
-        html_msg = None
-
-    _send_mail(subject, text_msg, settings.COMMENT_FROM_EMAIL, [receiver], html=html_msg)
-
-
 def get_comment_from_key(key):
     class TmpComment:
         is_valid = True
         why_invalid = None
         obj = None
 
-    comment = TmpComment()
+    temp_comment = TmpComment()
     comment_model = apps.get_model('comment', 'Comment')
     try:
         comment_dict = signing.loads(str(key))
@@ -213,31 +172,28 @@ class TmpComment:
                 'parent': comment_model.objects.get_parent_comment(comment_dict['parent'])
             }
         )
-        comment.obj = comment_model(**comment_dict)
+        temp_comment.obj = comment_model(**comment_dict)
 
     except (ValueError, KeyError, AttributeError, signing.BadSignature):
-        comment.is_valid = False
-        comment.why_invalid = CommentFailReason.BAD
-
-    if comment.is_valid and comment_model.objects.comment_exists(comment.obj):
-        comment.is_valid = False
-        comment.why_invalid = CommentFailReason.EXISTS
-        comment.obj = None
-
-    if comment.is_valid:
-        comment.obj.save()
-        comment.obj.refresh_from_db()
-    return comment
+        temp_comment.is_valid = False
+        temp_comment.why_invalid = CommentFailReason.BAD
 
-
-def process_anonymous_commenting(request, comment, api=False):
-    key = signing.dumps(comment.to_dict(), compress=True)
-    site = get_current_site(request)
-    send_email_confirmation_request(comment, comment.to_dict()['email'], key, site, api=api)
-    return EmailInfo.CONFIRMATION_SENT
+    if temp_comment.is_valid and comment_model.objects.comment_exists(temp_comment.obj):
+        temp_comment.is_valid = False
+        temp_comment.why_invalid = CommentFailReason.EXISTS
+        temp_comment.obj = None
+    return temp_comment
 
 
 def get_user_for_request(request):
     if request.user.is_authenticated:
         return request.user
     return None
+
+
+def get_username_for_comment(comment):
+    if not comment.user:
+        if settings.COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME:
+            return comment.email.split('@')[0]
+        return settings.COMMENT_ANONYMOUS_USERNAME
+    return comment.user.username
diff --git a/comment/validators.py b/comment/validators.py
index 5108b2c..f123a4a 100644
--- a/comment/validators.py
+++ b/comment/validators.py
@@ -26,6 +26,12 @@ def dispatch(self, request, *args, **kwargs):
             return JsonResponse({'type': ExceptionError.ERROR_TYPE, 'detail': exc.detail}, status=400)
         return super().dispatch(request, *args, **kwargs)
 
+    def get_request_data(self, request, item):
+        value = request.GET.get(item) or request.POST.get(item)
+        if not value and self.api:
+            value = request.data.get(item)
+        return value
+
     @abstractmethod
     def validate(self, request):
         pass
@@ -80,9 +86,9 @@ def validate_model_object(self, app_name, model_name, model_id):
 
     def validate(self, request):
         super().validate(request)
-        app_name = request.GET.get("app_name") or request.POST.get("app_name")
-        model_name = request.GET.get("model_name") or request.POST.get("model_name")
-        model_id = request.GET.get("model_id") or request.POST.get("model_id")
+        app_name = self.get_request_data(request, 'app_name')
+        model_name = self.get_request_data(request, 'model_name')
+        model_id = self.get_request_data(request, 'model_id')
         validated_app_name = self.validate_app_name(app_name)
         validated_model_name = self.validate_model_name(model_name)
         validated_model_id = self.validate_model_id(model_id)
@@ -110,8 +116,8 @@ def validate_comment_object(self, model_id, parent_id):
 
     def validate(self, request):
         super().validate(request)
-        model_id = request.GET.get("model_id") or request.POST.get("model_id")
-        parent_id = request.GET.get("parent_id") or request.POST.get("parent_id")
+        model_id = self.get_request_data(request, 'model_id')
+        parent_id = self.get_request_data(request, 'parent_id')
         if not parent_id or parent_id == '0':
             return
         validated_parent_id = self.validate_parent_id(parent_id)
diff --git a/comment/views/__init__.py b/comment/views/__init__.py
index 6210341..a6aeff9 100644
--- a/comment/views/__init__.py
+++ b/comment/views/__init__.py
@@ -2,3 +2,4 @@
 from comment.views.comments import *
 from comment.views.reactions import *
 from comment.views.flags import *
+from comment.views.followers import *
diff --git a/comment/views/comments.py b/comment/views/comments.py
index f56c31f..85d5c8a 100644
--- a/comment/views/comments.py
+++ b/comment/views/comments.py
@@ -9,12 +9,12 @@
 from comment.models import Comment
 from comment.forms import CommentForm
 from comment.utils import (
-    get_comment_context_data, get_comment_from_key, process_anonymous_commenting,
-    get_user_for_request, CommentFailReason
+    get_comment_context_data, get_comment_from_key, get_user_for_request, CommentFailReason
 )
 from comment.mixins import CanCreateMixin, CanEditMixin, CanDeleteMixin
 from comment.conf import settings
-from comment.messages import EmailError
+from comment.messages import EmailError, EmailInfo
+from comment.service.email import DABEmailService
 
 
 class BaseCommentView(FormView):
@@ -34,6 +34,7 @@ def get_form_kwargs(self):
 
 class CreateComment(CanCreateMixin, BaseCommentView):
     comment = None
+    email_service = None
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -59,14 +60,18 @@ def form_valid(self, form):
             parent=self.parent_comment,
             email=email,
             posted=time_posted
-            )
+        )
+
+        self.email_service = DABEmailService(_comment, self.request)
 
         if settings.COMMENT_ALLOW_ANONYMOUS and not user:
             # send response, please verify your email to post this comment.
-            response_msg = process_anonymous_commenting(self.request, _comment)
-            messages.info(self.request, response_msg)
+            self.email_service.send_confirmation_request()
+            messages.info(self.request, EmailInfo.CONFIRMATION_SENT)
         else:
             _comment.save()
+            if settings.COMMENT_ALLOW_SUBSCRIPTION:
+                self.email_service.send_notification_to_followers()
             self.comment = _comment
 
         return self.render_to_response(self.get_context_data())
@@ -116,17 +121,22 @@ def post(self, request, *args, **kwargs):
 
 
 class ConfirmComment(View):
-    @staticmethod
-    def get(request, *args, **kwargs):
-        key = kwargs.get('key', None)
-        comment = get_comment_from_key(key)
+    email_service = None
 
-        if comment.why_invalid == CommentFailReason.BAD:
+    def get(self, request, *args, **kwargs):
+        key = kwargs.get('key', None)
+        temp_comment = get_comment_from_key(key)
+        if temp_comment.why_invalid == CommentFailReason.BAD:
             messages.error(request, EmailError.BROKEN_VERIFICATION_LINK)
-        elif comment.why_invalid == CommentFailReason.EXISTS:
+        elif temp_comment.why_invalid == CommentFailReason.EXISTS:
             messages.warning(request, EmailError.USED_VERIFICATION_LINK)
-
-        if not comment.is_valid:
+        if not temp_comment.is_valid:
             return render(request, template_name='comment/anonymous/discarded.html')
 
-        return redirect(comment.obj.get_url(request))
+        comment = temp_comment.obj
+        comment.save()
+        comment.refresh_from_db()
+        if settings.COMMENT_ALLOW_SUBSCRIPTION:
+            self.email_service = DABEmailService(comment, request)
+            self.email_service.send_notification_to_followers()
+        return redirect(comment.get_url(request))
diff --git a/comment/views/followers.py b/comment/views/followers.py
new file mode 100644
index 0000000..ecef4ee
--- /dev/null
+++ b/comment/views/followers.py
@@ -0,0 +1,61 @@
+from django.core.exceptions import ValidationError
+from django.core.validators import EmailValidator
+from django.http import JsonResponse
+
+from django.views.generic.base import View
+
+from comment.models import Follower
+from comment.mixins import CanSubscribeMixin
+from comment.validators import ContentTypeValidator
+from comment.messages import FollowError
+
+
+class BaseToggleFollowView(ContentTypeValidator):
+    response_class = None
+
+    def get_response_class(self):
+        assert self.response_class is not None, (
+                "'%s' should either include a `response_class` attribute, "
+                "or override the `get_response_class()` method."
+                % self.__class__.__name__
+        )
+        return self.response_class
+
+    def post(self, request, *args, **kwargs):
+        """ Allow authenticated users only, anonymous may be added in the future """
+        email = request.POST.get('email', None)
+        response_class = self.get_response_class()
+        if email:
+            email_validator = EmailValidator(FollowError.EMAIL_INVALID)
+            try:
+                email_validator(email)
+            except ValidationError as error:
+                return response_class({'invalid_email': error.messages}, status=400)
+
+        user = request.user
+        if user.email:
+            email = user.email
+
+        if not email:
+            return response_class({
+                'email_required': True,
+                'message': FollowError.EMAIL_REQUIRED.format(model_object=str(self.model_obj))
+            }, status=400)
+
+        if not user.email:
+            user.email = email
+            user.save()
+
+        username = user.username or email.aplit('@')[0]
+        following = Follower.objects.toggle_follow(email=email, model_object=self.model_obj, username=username)
+        return response_class({
+            'following': following,
+            'app_name': self.model_obj._meta.app_label,
+            'model_name': self.model_obj.__class__.__name__,
+            'model_id': self.model_obj.id,
+            'model_object': str(self.model_obj)
+        }, status=200)
+
+
+class ToggleFollowView(BaseToggleFollowView, CanSubscribeMixin, View):
+    response_class = JsonResponse
diff --git a/docs/source/Changelog.rst b/docs/source/Changelog.rst
index 4818ae7..f857973 100644
--- a/docs/source/Changelog.rst
+++ b/docs/source/Changelog.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.5.1
+------
+
+- Fix version/installation issue.
+- Fix class names conflict.
+
 2.5.0
 ------
 
diff --git a/docs/source/Web API.rst b/docs/source/Web API.rst
index 8d57152..27f5344 100644
--- a/docs/source/Web API.rst	
+++ b/docs/source/Web API.rst	
@@ -22,10 +22,14 @@ The available actions with permitted user as follows:
 
     8. Resolve or reject flag. This is used to revoke the flagged comment state (admins and moderators)
 
-    9. Retrieve the list of comments and associated replies to a given content type and object ID.
+    9. Retrieve a list of comments and associated replies to a given content type and object ID.
 
     10. Confirm comment made by an anonymous users.
 
+    11. Subscribe a thread. (authenticated users)
+
+    12. Retrieve a list of subscribers to a given thread/content type. (admins and moderators)
+
 These actions are explained below.
 
 Setup:
@@ -84,19 +88,16 @@ This action can be performed by providing the url with data queries related to t
 Get request accepts 3 params:
 
 
-- ``model_name``: is the model name of the content type that have comments associated with it.
-- ``model_id``: is the id of an object of that model
-- ``app_name``: is the name of the app that contains the model.
-
+- ``model_name``: the model name of the content type that has comments associated with it.
+- ``model_id``: the id of an object of that model.
+- ``app_name``: the name of the app that contains the model.
 
 
-
-For example if you are using axios to retrieve the comment list of second object (id=2) of a model (content type) called post inside the app(django app) post.
-you can do the following:
+Endpoint call:
 
 ::
 
-    $ curl -H "Content-Type: application/json" 'http://localhost:8000/api/comments/?model_name=MODEL_NAME&model_id=ID&app_name=APP_NAME''
+    $ curl -H "Content-Type: application/json" '$BASE_URL/api/comments/?model_name=MODEL_NAME&model_id=ID&app_name=APP_NAME''
 
 
 **2- Create a comment or reply to an existing comment:**
@@ -112,7 +113,9 @@ Example: posting a parent comment
 
 ::
 
-    $ curl -X POST -u USERNAME:PASSWORD -d "content=CONTENT" -H "Content-Type: application/json" "http://localhost:8000/api/comments/create/?model_name=MODEL_NAME&model_id=ID&app_name=APP_NAME&parent_id=0"
+    $ curl -X POST -u USERNAME:PASSWORD -d "content=CONTENT" -H "Content-Type: application/json" "$BASE_URL/api/comments/create/?model_name=MODEL_NAME&model_id=ID&app_name=APP_NAME&parent_id=0"
+
+PS: The parent_id param can be ignored as well to post a parent comment.
 
 
 **3- Update a comment:**
@@ -124,7 +127,7 @@ This action requires the ``comment.id`` that you want to update:
 
 ::
 
-    $ curl -X PUT -u USERNAME:PASSWORD -d "content=CONTENT" -H "Content-Type: application/json" "http://localhost:8000/api/comments/ID/
+    $ curl -X PUT -u USERNAME:PASSWORD -d "content=CONTENT" -H "Content-Type: application/json" "$BASE_URL/api/comments/ID/
 
 
 **4- Delete a comment:**
@@ -135,7 +138,7 @@ This action requires the ``comment.id`` that you want to delete:
 
 ::
 
-    $ curl -X DELETE -u USERNAME:PASSWORD -H "Content-Type: application/json" "http://localhost:8000/api/comments/ID/
+    $ curl -X DELETE -u USERNAME:PASSWORD -H "Content-Type: application/json" "$BASE_URL/api/comments/ID/
 
 
 **5- React to a comment:**
@@ -149,10 +152,11 @@ This action requires the ``comment.id``. and,
 
 ::
 
-   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" "http://localhost:8000/api/comments/ID/react/REACTION_TYPE/
+   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" "$BASE_URL/api/comments/ID/react/REACTION_TYPE/
 
 
-PS: As in the UI, clicking the **liked** button will remove the reaction => unlike the comment. This behaviour is performed when repeating the same post request.
+
+PS: This endpoint is for toggling the reaction as in the UI, clicking the **liked** button will remove the reaction => unlike the comment. This behaviour is performed when repeating the same post request.
 
 
 **6- Report a comment**
@@ -176,7 +180,7 @@ This action requires the ``comment.id``.
 
 ::
 
-   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" -d '{"reason":1, "info":""}' http://localhost:8000/api/comments/ID/flag/
+   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" -d '{"reason":1, "info":""}' $BASE_URL/api/comments/ID/flag/
 
 
 2. Un-flag a comment:
@@ -185,7 +189,7 @@ To un-flag a FLAGGED comment, set reason value to `0` or remove the payload from
 
 ::
 
-    $ curl -X POST -u USERNAME:PASSWORD http://localhost:8000/api/comments/ID/flag/
+    $ curl -X POST -u USERNAME:PASSWORD $BASE_URL/api/comments/ID/flag/
 
 
 **7- Change flagged comment state**
@@ -194,7 +198,7 @@ To un-flag a FLAGGED comment, set reason value to `0` or remove the payload from
 
 Authorization must be provided as a TOKEN or USERNAME:PASSWORD.
 
-This action requires comment admin or moderator privilege.
+This action requires comment `admin` or `moderator` privilege.
 
 .. code:: python
 
@@ -204,7 +208,7 @@ This action requires comment admin or moderator privilege.
 
 ::
 
-   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" -d '{"state":3}' http://localhost:8000/api/comments/ID/flag/state/change/
+   $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" -d '{"state":3}' $BASE_URL/api/comments/ID/flag/state/change/
 
 Repeating the same request and payload toggle the state to its original.
 
@@ -220,10 +224,30 @@ Get request accepts 3 params:
 Example:
 
 :: code:: bash
-    $ curl -X GET -H "Content-Type: application/json" http://localhost:8000/api/comments/confirm/KEY/
+    $ curl -X GET -H "Content-Type: application/json" $BASE_URL/api/comments/confirm/KEY/
 
 Since the key generated for each comment is unique, it can only be used once to verify. Any tampering with the key will result in a BAD HTTP request(400).
 
 
+**9- Subscribe a thread**
+
+``POST`` is the allowed method to toggle subscription.
+
+Authorization must be provided as a TOKEN or USERNAME:PASSWORD.
+
+Subscription variable ``COMMENT_ALLOW_SUBSCRIPTION`` must be enabled in ``settings.py``.
+
+:: code:: bash
+    $ curl -X POST -u USERNAME:PASSWORD -H "Content-Type: application/json" "$BASE_URL/api/comments/toggle-subscription/?model_name=MODEL_NAME&model_id=ID&app_name=APP_NAME"
+
+
+**10- Retrieve subscribers on a given thread/content type**
 
+``GET``.
 
+Authorization must be provided as a TOKEN or USERNAME:PASSWORD.
+
+This action requires comment `admin` or `moderator` privilege.
+
+:: code:: bash
+    $ curl -X GET -u USERNAME:PASSWORD -H "Content-Type: application/json" $BASE_URL/api/comments/subscribers/
diff --git a/docs/source/introduction.rst b/docs/source/introduction.rst
index 9a9b261..5117f1d 100644
--- a/docs/source/introduction.rst
+++ b/docs/source/introduction.rst
@@ -71,6 +71,8 @@ It allows you to integrate commenting functionality with any model you have e.g.
 
     8. Resolve or reject flag. This is used to revoke the flagged comment state (admins and moderators)
 
+    9. Follow and unfollow thread. (authenticated users)
+
 - All actions are done by Fetch API since V2.0.0
 
-- Bootstrap 4.1.1 is used in comment templates for responsive design.
\ No newline at end of file
+- Bootstrap 4.1.1 is used in comment templates for responsive design.
diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 18051cc..db83984 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -118,3 +118,9 @@ COMMENT_USE_GRAVATAR
 Whether to use gravatar_ for displaying profile pictures alongside comments. Defaults to ``False``.
 
 .. _gravatar: https://gravatar.com/
+
+
+COMMENT_ALLOW_SUBSCRIPTION
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Allow threads subscription feature. Defaults to ``False``.
diff --git a/docs/source/styling.rst b/docs/source/styling.rst
index 8803944..4792470 100644
--- a/docs/source/styling.rst
+++ b/docs/source/styling.rst
@@ -5,57 +5,71 @@ Some actual customizations has been done in the example_ project
 
 .. _example: https://github.com/Radi85/Comment/tree/master/test/example
 
-1- Default blocks:
----------------------
+1- Templates and default blocks:
+--------------------------------
 
 BS classes, pagination and some other template values can be now customized from within your templates directory as follows:
 
     1. Create ``comment`` folder inside templates directory.
 
-    2. Create a new template file ``.html`` give it the same name of the default template needs to be overridden and put it in the right directory.
+    2. Create a new template file ``.html`` give it the same name of the default template that needs to be overridden and put it in the right directory.
 
     **Templates tree:**
 
     .. code:: bash
 
+        comment
         └── templates
             └── comment
                 ├── anonymous
-                │   ├── confirmation_request.html
-                │   ├── confirmation_request.txt
-                │   └── discarded.html
-                ├── bootstrap.html
+                │   ├── confirmation_request.html
+                │   ├── confirmation_request.txt
+                │   └── discarded.html
                 ├── comments
-                │   ├── apply_icon.html
-                │   ├── base.html
-                │   ├── cancel_icon.html
-                │   ├── child_comment.html
-                │   ├── comment_body.html
-                │   ├── comment_content.html
-                │   ├── comment_form.html
-                │   ├── comment_modal.html
-                │   ├── content.html
-                │   ├── create_comment.html
-                │   ├── delete_icon.html
-                │   ├── edit_icon.html
-                │   ├── messages.html
-                │   ├── pagination.html
-                │   ├── parent_comment.html
-                │   ├── reject_icon.html
-                │   ├── resolve_icon.html
-                │   ├── update_comment.html
-                │   └── urlhash.html
+                │   ├── apply_icon.html
+                │   ├── base.html
+                │   ├── cancel_icon.html
+                │   ├── child_comment.html
+                │   ├── comment_body.html
+                │   ├── comment_content.html
+                │   ├── comment_form.html
+                │   ├── comment_modal.html
+                │   ├── content.html
+                │   ├── create_comment.html
+                │   ├── delete_icon.html
+                │   ├── edit_icon.html
+                │   ├── messages.html
+                │   ├── pagination.html
+                │   ├── parent_comment.html
+                │   ├── reject_icon.html
+                │   ├── resolve_icon.html
+                │   ├── three_dots_menu.html
+                │   ├── update_comment.html
+                │   └── urlhash.html
+                ├── email
+                │   ├── email_template.html
+                │   └── footer.html
                 ├── flags
-                │   ├── flag_icon.html
-                │   ├── flag_modal.html
-                │   └── flags.html
+                │   ├── flag_icon.html
+                │   ├── flag_modal.html
+                │   └── flags.html
+                ├── follow
+                │   ├── follow.html
+                │   ├── follow_icon.html
+                │   └── follow_modal.html
+                ├── notifications
+                │   ├── notification.html
+                │   └── notification.txt
                 ├── reactions
-                │   ├── dislike_icon.html
-                │   ├── like_icon.html
-                │   └── reactions.html
+                │   ├── dislike_icon.html
+                │   ├── like_icon.html
+                │   └── reactions.html
+                ├── base.html
+                ├── bootstrap.html
                 └── static.html
 
 
+
 for example to override the BS classes of `submit buttons` and pagination style do the following:
 
     create ``templates/comment/comments/create_comment.html``
@@ -282,6 +296,21 @@ Some block tags may not work on old versions.
     {% block resolved_icon_color %}#427297{% endblock resolved_icon_color %}
 
 
+**follow_icon.html**
+
+.. code:: jinja
+
+    {% extends "comment/follow/follow_icon.html" %}
+
+    {% block follow_img_icon %}
+        {#
+        IMPORTANT: please consider adding these classes to your icon element as they are used in JS
+        class="comment-follow-icon {% if user|has_followed:model_object %}user-has-followed{% endif %}"
+        #}
+        Here comes your favorite icon
+    {% endblock follow_img_icon %}
+
+
 **comment_modal.html**
 
 .. code:: jinja
@@ -319,6 +348,56 @@ Some block tags may not work on old versions.
     {% block flag_link_cls %}{% endblock flag_link_cls %}
 
 
+**follow_modal.html**
+
+.. code:: jinja
+
+    {% extends "comment/follow/follow_modal.html" %}
+
+    {% block title %}
+    {% trans "Please insert your email to follow this thread" %}
+    {% endblock title %}
+
+    {% block email_input %}
+        <div class="row">
+            <div class="col-3">
+                <label for="email">Email:</label>
+            </div>
+            <div class="col-9">
+
+                <input id="email" class="form-control mr-2 w-100" type="email" name="email" required>
+                <div class="error text-danger small mt-1"></div>
+            </div>
+        </div>
+    {% endblock email_input %}
+
+    {% block follow_btn_extra_cls %}{% endblock follow_btn_extra_cls %}
+
+
+Email templates:
+^^^^^^^^^^^^^^^^^
+
+Responsive email templates are used from https://github.com/leemunroe/responsive-html-email-template
+
+This can be overridden by creating ``base.html`` in `templates/comment/email/` directory.
+
+Both ``confirmation_request.html`` and ``notification.html`` extends the base email template and they have the following blocks
+for partial customization:
+
+.. code:: jinja
+
+    {% extends "comment/notifications/notification.html" %}
+
+    {% block content %}
+    {# your custom email message/template here #}
+    {% endblock content %}
+
+    {% block footer %}
+    {# your footer here #}
+    {% endblock footer %}
+
+PS: The footer template is disabled by default.
+
 2- CSS file:
 ------------
 
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
index d82e3ee..ce55830 100644
--- a/docs/source/usage.rst
+++ b/docs/source/usage.rst
@@ -188,4 +188,23 @@ To further customize different attributes related to anonymous commenting, you m
 5. Enable gravatar:
 ^^^^^^^^^^^^^^^^^^^^
 
-To enable using gravatar for profile pics set ``COMMENT_USE_GRAVATAR`` in settings.py to ``True``
+To enable using gravatar for profile pics set ``COMMENT_USE_GRAVATAR`` in `settings.py` to ``True``
+
+
+6. Enable subscription:
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+To enable app subscription set ``COMMENT_ALLOW_SUBSCRIPTION`` in `settings.py` to ``True``
+
+This will enable the UI functionality and the API endpoint to follow and unfollow `thread`.
+
+The thread can be a `parent` comment or the `content type` (i.g. Post, Picture, Video...) that uses the comment model.
+
+**Automatic Subscription:**
+
+    1. Creating a comment in a thread will set the user automatically as a follower of the `thread`.
+    2. Replying to a comment will set the user as a follower of the `parent` comment
+
+An email notification will be sent to the thread's followers up on adding a new comment to the thread.
+
+PS: This feature needs the email settings to be configured similar to `4. Allow commenting by anonymous:`_
diff --git a/test/settings.py b/test/settings.py
index 46e15fc..6bfd0ce 100644
--- a/test/settings.py
+++ b/test/settings.py
@@ -98,11 +98,10 @@
 EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER', 'user@domain')
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
 EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD', 'password')
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+EMAIL_BACKEND = os.environ.get('EMAIL_BACKEND', 'django.core.mail.backends.console.EmailBackend')
 EMAIL_HOST = os.environ.get('EMAIL_HOST', 'localhost')
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
-EMAIL_USE_SSL = False
 
 COMMENT_ALLOW_ANONYMOUS = True
 COMMENT_FROM_EMAIL = os.environ.get('COMMENT_FROM_EMAIL', 'user@doamin')
@@ -111,5 +110,8 @@
 COMMENT_PER_PAGE = 4
 
 COMMENT_USE_GRAVATAR = True
+COMMENT_USE_EMAIL_FIRST_PART_AS_USERNAME = True
 
 COMMENT_ALLOW_TRANSLATION = True
+
+COMMENT_ALLOW_SUBSCRIPTION = True
diff --git a/tox.ini b/tox.ini
index 588bc4b..994934c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,6 +37,7 @@ commands =
     pip list
     flake8 comment/
     python manage.py migrate
+    python manage.py compilemessages -l test
     coverage run manage.py test
     coverage report -m