diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 4679dae..106cdc3 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -99,6 +99,14 @@ class ContentViewerController < ApplicationController
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
 
+    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
+    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' canceled") % params[:email]
+      end
+    end
+
     @comments = @page.comments(true).as_thread
     @comments_count = @page.comments.count
     if params[:slideshow]
diff --git a/app/models/article.rb b/app/models/article.rb
index 2e48ea9..ce47f2f 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -34,6 +34,7 @@ class Article < ActiveRecord::Base
   settings_items :display_hits, :type => :boolean, :default => true
   settings_items :author_name, :type => :string, :default => ""
   settings_items :allow_members_to_edit, :type => :boolean, :default => false
+  settings_items :followers, :type => Array, :default => []
 
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 50af142..ac9a084 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -75,11 +75,30 @@ class Comment < ActiveRecord::Base
     article.comments_updated if article.kind_of?(Article)
   end
 
-  after_create do |comment|
-    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
-      Comment::Notifier.deliver_mail(comment)
+  after_create :new_follower
+  def new_follower
+    if source.kind_of?(Article)
+      article.followers += [author_email]
+      article.followers -= article.profile.notification_emails
+      article.followers.uniq!
+      article.save
+    end
+  end
+
+  after_create :notify_by_mail
+  def notify_by_mail
+    if source.kind_of?(Article) && article.notify_comments?
+      if !article.profile.notification_emails.empty?
+        Comment::Notifier.deliver_mail(self)
+      end
+      emails = article.followers - [author_email]
+      if !emails.empty?
+        Comment::Notifier.deliver_mail_to_followers(self, emails)
+      end
     end
+  end
 
+  after_create do |comment|
     if comment.source.kind_of?(Article)
       comment.article.create_activity if comment.article.activity.nil?
       if comment.article.activity
@@ -138,6 +157,22 @@ class Comment < ActiveRecord::Base
         :environment => profile.environment.name,
         :url => profile.environment.top_url
     end
+    def mail_to_followers(comment, emails)
+      profile = comment.article.profile
+      bcc emails
+      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
+      body :recipient => profile.nickname || profile.name,
+        :sender => comment.author_name,
+        :sender_link => comment.author_link,
+        :article_title => comment.article.name,
+        :comment_url => comment.url,
+        :unsubscribe_url => comment.article.view_url.merge({:unfollow => true}),
+        :comment_title => comment.title,
+        :comment_body => comment.body,
+        :environment => profile.environment.name,
+        :url => profile.environment.top_url
+    end
   end
 
   def rejected?
diff --git a/app/models/user.rb b/app/models/user.rb
index 020a4a9..520d344 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -114,6 +114,7 @@ class User < ActiveRecord::Base
 
   # Activates the user in the database.
   def activate
+    return false unless self.person
     self.activated_at = Time.now.utc
     self.activation_code = nil
     self.person.visible = true
diff --git a/app/views/comment/notifier/mail_to_followers.rhtml b/app/views/comment/notifier/mail_to_followers.rhtml
new file mode 100644
index 0000000..8cb47f9
--- /dev/null
+++ b/app/views/comment/notifier/mail_to_followers.rhtml
@@ -0,0 +1,22 @@
+<%= _('Hi!') %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Access the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _('Access the address below to cancel comments notification:') %>
+<%= url_for @unsubscribe_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/content_viewer/_confirm_unfollow.rhtml b/app/views/content_viewer/_confirm_unfollow.rhtml
new file mode 100644
index 0000000..0156280
--- /dev/null
+++ b/app/views/content_viewer/_confirm_unfollow.rhtml
@@ -0,0 +1,12 @@
+<% if @unfollow_form %>
+<div class='unfollow-article'>
+  <h1><%= _('Cancel notification of new comments') %></h1>
+  <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
+    <%= hidden_field_tag(:unfollow, 'commit') %>
+    <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
+    <% button_bar do %>
+      <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
+    <% end %>
+  <% end %>
+</div>
+<% end %>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 7ba980a..d2a12c9 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -6,6 +6,8 @@
 
 <div id="article" class="<%= @page.css_class_name %>">
 
+<%= render :partial => 'confirm_unfollow' %>
+
 <div id="article-toolbar"></div>
 
 <script type="text/javascript">
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4dd7fc7..d8df85f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5896,6 +5896,10 @@ h1#agenda-title {
 
 /* }}} */
 
+.unfollow-article {
+  margin-bottom: 40px;
+}
+
 #alt-beautify {
   background-color: #EDEDED;
   border: 1px solid #666666;
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 066b3fb..ba677b9 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -1705,6 +1705,11 @@ class ArticleTest < ActiveSupport::TestCase
     assert !a.allow_edit?(nil)
   end
 
+  should 'has a empty list of followers by default' do
+    a = Article.new
+    assert_equal [], a.followers
+  end
+
   should 'get first image from lead' do
     a = fast_create(Article, :body => '<p>Foo</p><p><img src="bar.png" />Bar<img src="foo.png" /></p>',
                              :abstract => '<p>Lead</p><p><img src="leadbar.png" />Bar<img src="leadfoo.png" /></p>')
diff --git a/test/unit/comment_notifier_test.rb b/test/unit/comment_notifier_test.rb
index 7f5f909..33ebab2 100644
--- a/test/unit/comment_notifier_test.rb
+++ b/test/unit/comment_notifier_test.rb
@@ -65,6 +65,21 @@ class CommentNotifierTest < ActiveSupport::TestCase
     end
   end
 
+  should "deliver mail to followers" do
+    author = create_user('follower_author').person
+    follower = create_user('follower').person
+    @article.followers += [follower.email]
+    @article.save!
+    @article.comments << Comment.new(:source => @article, :author => author, :title => 'comment title', :body => 'comment body')
+    assert_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
+  end
+
+  should "not deliver follower's mail about new comment to comment's author" do
+    follower = create_user('follower').person
+    @article.comments << Comment.new(:source => @article, :author => follower, :title => 'comment title', :body => 'comment body')
+    assert_not_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
+  end
+
   private
 
     def read_fixture(action)
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index d0c1ef7..6964fad 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -355,6 +355,48 @@ class CommentTest < ActiveSupport::TestCase
     assert c.rejected?
   end
 
+  should 'subscribe user as follower of an article on new comment' do
+    owner = create_user('owner_of_article').person
+    person = create_user('follower').person
+    article = fast_create(Article, :profile_id => owner.id)
+    assert_not_includes article.followers, person.email
+    article.comments.create!(:source => article, :author => person, :title => 'new comment', :body => 'new comment')
+    assert_includes article.reload.followers, person.email
+  end
+
+  should 'subscribe guest user as follower of an article on new comment' do
+    article = fast_create(Article, :profile_id => create_user('article_owner').person.id)
+    assert_not_includes article.followers, 'follower@example.com'
+    article.comments.create!(:source => article, :name => 'follower', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
+    assert_includes article.reload.followers, 'follower@example.com'
+  end
+
+  should 'keep unique emails in list of followers' do
+    article = fast_create(Article, :profile_id => create_user('article_owner').person.id)
+    article.comments.create!(:source => article, :name => 'follower one', :email => 'follower@example.com', :title => 'new comment', :body => 'new comment')
+    article.comments.create!(:source => article, :name => 'follower two', :email => 'follower@example.com', :title => 'another comment', :body => 'new comment')
+    assert_equal 1, article.reload.followers.select{|v| v == 'follower@example.com'}.count
+  end
+
+  should 'not subscribe owner as follower of an article on new comment' do
+    owner = create_user('owner_of_article').person
+    article = fast_create(Article, :profile_id => owner.id)
+    article.comments.create!(:source => article, :author => owner, :title => 'new comment', :body => 'new comment')
+    assert_not_includes article.reload.followers, owner.email
+  end
+
+  should 'not subscribe admins as follower of an article on new comment' do
+    owner = fast_create(Community)
+    follower = create_user('follower').person
+    admin = create_user('admin_of_community').person
+    owner.add_admin(admin)
+    article = fast_create(Article, :profile_id => owner.id)
+    article.comments.create!(:source => article, :author => follower, :title => 'new comment', :body => 'new comment')
+    article.comments.create!(:source => article, :author => admin, :title => 'new comment', :body => 'new comment')
+    assert_not_includes article.reload.followers, admin.email
+    assert_includes article.followers, follower.email
+  end
+
   should 'update article activity when add a comment' do
     profile = create_user('testuser').person
     article = create(TinyMceArticle, :profile => profile)
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 6dbe034..6ddea58 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -486,6 +486,12 @@ class UserTest < ActiveSupport::TestCase
     assert new_user.activated?
   end
 
+  should 'cancel activation if user has no person associated' do
+    user = new_user
+    user.stubs(:person).returns(nil)
+    assert !user.activate
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
--
libgit2 0.21.2