diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index ae2e1b25..a8628fc5 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -274,6 +274,15 @@ ul.notes {
 }
 
 
+.common-note-form {
+  margin: 0;
+  height: 140px;
+  background: #F9F9F9;
+  padding: 3px;
+  padding-bottom: 25px;
+  border: 1px solid #DDD;
+}
+
 
 .note-form-actions {
   background: #F9F9F9;
@@ -281,8 +290,8 @@ ul.notes {
   padding: 0 5px;
 
   .note-form-option {
-    margin-top: 8px;
-    margin-left: 15px;
+    margin-top: 10px;
+    margin-left: 30px;
     @extend .pull-left;
   }
 
diff --git a/app/contexts/notes/create_context.rb b/app/contexts/notes/create_context.rb
index 1367dff4..36ea76ff 100644
--- a/app/contexts/notes/create_context.rb
+++ b/app/contexts/notes/create_context.rb
@@ -3,8 +3,6 @@ module Notes
     def execute
       note = project.notes.new(params[:note])
       note.author = current_user
-      note.notify = params[:notify].present?
-      note.notify_author = params[:notify_author].present?
       note.save
       note
     end
diff --git a/app/models/note.rb b/app/models/note.rb
index f56f999f..f26420ca 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -22,9 +22,6 @@ class Note < ActiveRecord::Base
   attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id,
                   :attachment, :line_code, :commit_id
 
-  attr_accessor :notify
-  attr_accessor :notify_author
-
   belongs_to :project
   belongs_to :noteable, polymorphic: true
   belongs_to :author, class_name: "User"
@@ -143,14 +140,6 @@ class Note < ActiveRecord::Base
     nil
   end
 
-  def notify
-    @notify ||= false
-  end
-
-  def notify_author
-    @notify_author ||= false
-  end
-
   # Returns true if this is an upvote note,
   # otherwise false is returned
   def upvote?
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index c2bdeafb..7add2921 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note js-new-note-form" } do |f|
+= form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note js-new-note-form common-note-form" } do |f|
 
   = note_target_fields
   = f.hidden_field :commit_id
@@ -26,15 +26,6 @@
 
       %a.btn.grouped.js-close-discussion-note-form Cancel
 
-    .note-form-option
-      = label_tag :notify do
-        = check_box_tag :notify, 1, false
-        %span.light Notify team via email
-
-      .js-notify-commit-author
-        = label_tag :notify_author do
-          = check_box_tag :notify_author, 1 , false
-          %span.light Notify commit author
     .note-form-option
       %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
         %i.icon-paper-clip
diff --git a/app/views/walls/show.html.haml b/app/views/walls/show.html.haml
index 0cd29486..78693b99 100644
--- a/app/views/walls/show.html.haml
+++ b/app/views/walls/show.html.haml
@@ -11,11 +11,6 @@
           .buttons
             = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
 
-          .note-form-option
-            = label_tag :notify do
-              = check_box_tag :notify, 1, false
-              %span.light Notify team via email
-
           .note-form-option
             %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
               %i.icon-paper-clip