diff --git a/lib/redmine_messenger.rb b/lib/redmine_messenger.rb
index 1f761c5..878ed5b 100644
--- a/lib/redmine_messenger.rb
+++ b/lib/redmine_messenger.rb
@@ -11,7 +11,7 @@ Rails.configuration.to_prepare do
       ActionController::Parameters.new(Setting[:plugin_redmine_messenger])
     end
 
-    def setting?(value)
+    def self.setting?(value)
       return true if settings[value].to_i == 1
     end
   end
diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb
index 047e89a..4f700b7 100644
--- a/lib/redmine_messenger/patches/issue_patch.rb
+++ b/lib/redmine_messenger/patches/issue_patch.rb
@@ -49,7 +49,7 @@ module RedmineMessenger
 
           Messenger.speak(l(:label_messenger_issue_created,
                             project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>",
-                            url: "<#{Messenger.object_url(self)}|#{ERB::Util.html_escape(self)}>#{Messenger.mentions(project, description) if Messenger.setting_for_project(project, :auto_mentions) or not Messenger.textfield_for_project(project, :default_mentions).empty? }",
+                            url: send_messenger_mention_url(project, description),
                             user: author),
                           channels, url, attachment: attachment, project: project)
         end
@@ -75,10 +75,21 @@ module RedmineMessenger
 
           Messenger.speak(l(:label_messenger_issue_updated,
                             project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>",
-                            url: "<#{Messenger.object_url self}|#{ERB::Util.html_escape(self)}>#{Messenger.mentions(project, current_journal.notes) if Messenger.setting_for_project(project, :auto_mentions) or not Messenger.textfield_for_project(project, :default_mentions).empty? }",
+                            url: send_messenger_mention_url(project, current_journal.notes),
                             user: current_journal.user),
                           channels, url, attachment: attachment, project: project)
         end
+
+        private
+
+        def send_messenger_mention_url(project, text)
+          mention_to = ''
+          if Messenger.setting_for_project(project, :auto_mentions) ||
+             Messenger.textfield_for_project(project, :default_mentions).present?
+            mention_to = Messenger.mentions(project, text)
+          end
+          "<#{Messenger.object_url(self)}|#{ERB::Util.html_escape(self)}>#{mention_to}"
+        end
       end
     end
   end