diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9c27ce3cb..c43071c2f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -640,7 +640,7 @@ module ApplicationHelper
   end
 
   def authoring(created, author, options={})
-    l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe
+    l(options[:label] || :label_added_time_by, :author => link_to_user(author), :badge => options[:badge], :age => time_tag(created)).html_safe
   end
 
   def time_tag(time)
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index d947f8233..fd5932482 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -68,4 +68,19 @@ module JournalsHelper
     css_classes = journal.private_notes? ? 'badge badge-private private' : ''
     content_tag('span', content.html_safe, :id => "journal-#{journal.id}-private_notes", :class => css_classes)
   end
+
+  def journal_user_badge(journal)
+    issue = journal&.journalized
+    return '' if issue.nil?
+
+    # Show only "Author" badge if the user is both an author and an assignee
+    case journal.user
+    when issue.author
+      content_tag('span', l(:label_author), class: 'badge badge-status-open')
+    when issue.assigned_to
+      content_tag('span', l(:field_assigned_to), class: 'badge badge-status-open')
+    else
+      ''
+    end
+  end
 end
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 51824a334..f5d11393f 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -18,4 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module MessagesHelper
+  def message_user_badge(message)
+    return '' if message&.parent.nil?
+
+    if message.parent.author == message.author
+      content_tag('span', l(:label_author), class: 'badge badge-status-open')
+    else
+      ''
+    end
+  end
 end
diff --git a/app/helpers/news_helper.rb b/app/helpers/news_helper.rb
index f807f9cc8..95cad0e24 100644
--- a/app/helpers/news_helper.rb
+++ b/app/helpers/news_helper.rb
@@ -18,4 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module NewsHelper
+  def news_comment_user_badge(comment)
+    return '' if comment&.commented.nil?
+
+    if comment.commented.author == comment.author
+      content_tag('span', l(:label_author), class: 'badge badge-status-open')
+    else
+      ''
+    end
+  end
 end
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 6690b04fc..d0a29a32c 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -66,6 +66,6 @@ module WikiHelper
   end
 
   def wiki_content_update_info(content)
-    l(:label_updated_time_by, :author => link_to_user(content.author), :age => time_tag(content.updated_on)).html_safe
+    l(:label_updated_time_by, :author => link_to_user(content.author), :age => time_tag(content.updated_on), :badge => '').html_safe
   end
 end
diff --git a/app/views/issues/tabs/_history.html.erb b/app/views/issues/tabs/_history.html.erb
index 0769f5725..1895bdb16 100644
--- a/app/views/issues/tabs/_history.html.erb
+++ b/app/views/issues/tabs/_history.html.erb
@@ -13,7 +13,7 @@
     </div>
     <h4 class='note-header'>
       <%= avatar(journal.user) %>
-      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by, :badge => journal_user_badge(journal) %>
       <%= render_private_notes_indicator(journal) %>
     </h4>
 
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index b8abf0321..aab5523ef 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -69,7 +69,7 @@
     <%= avatar(message.author) %>
     <%= link_to message.subject, { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
     -
-    <%= authoring message.created_on, message.author %>
+    <%= authoring message.created_on, message.author, :badge => message_user_badge(message) %>
   </h4>
   <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
   <%= link_to_attachments message, :author => false, :thumbnails => true %>
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 04ea54a0a..931d94486 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -42,7 +42,7 @@
                               :title => l(:button_delete),
                               :class => 'icon-only icon-del' %>
     </div>
-    <h4><%= avatar(comment.author) %><%= authoring comment.created_on, comment.author %></h4>
+    <h4><%= avatar(comment.author) %><%= authoring comment.created_on, comment.author, :badge => news_comment_user_badge(comment) %></h4>
     <div class="wiki">
     <%= textilizable(comment.comments) %>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c3f4925cd..b498cc655 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -895,8 +895,8 @@ en:
   label_missing_feeds_access_key: Missing a Atom access key
   label_feeds_access_key_created_on: "Atom access key created %{value} ago"
   label_module_plural: Modules
-  label_added_time_by: "Added by %{author} %{age} ago"
-  label_updated_time_by: "Updated by %{author} %{age} ago"
+  label_added_time_by: "Added by %{author} %{badge} %{age} ago"
+  label_updated_time_by: "Updated by %{author} %{badge} %{age} ago"
   label_updated_time: "Updated %{value} ago"
   label_jump_to_a_project: Jump to a project...
   label_file_plural: Files
@@ -1089,6 +1089,7 @@ en:
   label_display_type_board: Board
   label_my_bookmarks: My bookmarks
   label_assign_to_me: Assign to me
+  label_author: Author
 
   button_login: Login
   button_submit: Submit