diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 91c18ff8f95..c7e8fdad7a0 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -92,6 +92,10 @@ module EventsHelper
       render "events/event_issue", issue: event.issue
     elsif event.push?
       render "events/event_push", event: event
+    elsif event.merge_request?
+      render "events/event_merge_request", merge_request: event.merge_request
+    elsif event.note?
+      render "events/event_note", note: event.note
     end
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index c7e93825f97..8681c2e4d90 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -30,6 +30,7 @@ class Event < ActiveRecord::Base
   delegate :name, :email, to: :author, prefix: true, allow_nil: true
   delegate :title, to: :issue, prefix: true, allow_nil: true
   delegate :title, to: :merge_request, prefix: true, allow_nil: true
+  delegate :title, to: :note, prefix: true, allow_nil: true
 
   belongs_to :author, class_name: "User"
   belongs_to :project
@@ -147,6 +148,10 @@ class Event < ActiveRecord::Base
     target if target_type == "MergeRequest"
   end
 
+  def note
+    target if target_type == "Note"
+  end
+
   def action_name
     if closed?
       "closed"
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml
index 64dc02e3f56..56801107d05 100644
--- a/app/views/events/_event_issue.atom.haml
+++ b/app/views/events/_event_issue.atom.haml
@@ -1,2 +1,2 @@
 %div{:xmlns => "http://www.w3.org/1999/xhtml"}
-  %p= simple_format issue.description
+  %p= markdown issue.description
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
new file mode 100644
index 00000000000..dea256bb7f2
--- /dev/null
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -0,0 +1,2 @@
+%div{xmlns: "http://www.w3.org/1999/xhtml"}
+  %p= markdown merge_request.description
diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml
new file mode 100644
index 00000000000..96039ad18dc
--- /dev/null
+++ b/app/views/events/_event_note.atom.haml
@@ -0,0 +1,2 @@
+%div{:xmlns => "http://www.w3.org/1999/xhtml"}
+  %p= markdown note.note
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml
index e44b366040f..17228c430ca 100644
--- a/app/views/events/_event_push.atom.haml
+++ b/app/views/events/_event_push.atom.haml
@@ -6,7 +6,7 @@
       %i
         at
         = commit[:timestamp].to_time.to_s(:short)
-    %blockquote= simple_format(escape_once(commit[:message]))
+    %blockquote= markdown(escape_once(commit[:message]))
   - if event.commits_count > 15
     %p
       %i