diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 14d4e19d1..9e92d6084 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1324,6 +1324,7 @@ issues.new.labels = Labels
 issues.new.add_labels_title = Apply labels
 issues.new.no_label = No Label
 issues.new.clear_labels = Clear labels
+issues.new.clear_branch_tag =  Clear branch or tag
 issues.new.no_items = No items
 issues.new.milestone = Milestone
 issues.new.add_milestone_title = Set milestone
@@ -1353,6 +1354,13 @@ issues.remove_label_at = removed the <div class="ui label" style="color: %s\; ba
 issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
 issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
 issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`
+
+issues.add_branch_at=`added this to the <b>%s</b> branch %s` 
+issues.add_tag_at =`added this to the <b>%s</b> tag %s`
+issues.change_branch_tag_at=  `modified the branch/tag from <b>%s</b> to <b>%s</b> %s`
+issues.remove_branch_at=`removed this from the <b>%s</b> branch %s`
+issues.remove_tag_at=`removed this from the <b>%s</b> tag %s`
+
 issues.deleted_milestone = `(deleted)`
 issues.self_assign_at = `self-assigned this %s`
 issues.add_assignee_at = `was assigned by <b>%s</b> %s`
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index de9f79319..4ebe0966d 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1336,6 +1336,7 @@ issues.new.labels=标签
 issues.new.add_labels_title=添加标签
 issues.new.no_label=未选择标签
 issues.new.clear_labels=清除选中标签
+issues.new.clear_branch_tag=清除选中分支/标签
 issues.new.no_items=无可选项
 issues.new.milestone=里程碑
 issues.new.add_milestone_title=设置里程碑
@@ -1365,6 +1366,13 @@ issues.remove_label_at=删除了 <div class="ui label" style="color: %s\; backgr
 issues.add_milestone_at=` %[2]s 添加了里程碑 <b>%[1]s</b>`
 issues.change_milestone_at=`%[3]s 修改了里程碑从 <b>%[1]s</b> 到 <b>%[2]s</b>`
 issues.remove_milestone_at=`%[2]s 删除了里程碑 <b>%[1]s</b>`
+
+issues.add_branch_at=` %[2]s 添加了分支 <b>%[1]s</b>`
+issues.add_tag_at =` %[2]s 添加了标签 <b>%[1]s</b>`
+issues.change_branch_tag_at=`%[3]s 修改了标签/分支从 <b>%[1]s</b> 到 <b>%[2]s</b>`
+issues.remove_branch_at=`%[2]s 删除了分支 <b>%[1]s</b>`
+issues.remove_tag_at=`%[2]s 删除了标签 <b>%[1]s</b>`
+
 issues.deleted_milestone= （已删除）
 issues.self_assign_at=`于 %s 指派给自己`
 issues.add_assignee_at=`于 %[2]s 被 <b>%[1]s</b> 指派`
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index e3c7df674..34adc8e21 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -594,5 +594,28 @@
 				{{end}}
 			</span>
 		</div>
+	{{else}}
+	<div class="timeline-item event" id="{{.HashTag}}">
+		<span class="badge">{{svg "octicon-milestone" 16}}</span>
+		<a class="ui avatar image" href="{{.Poster.HomeLink}}">
+			<img src="{{.Poster.RelAvatarLink}}">
+		</a>
+		<span class="text grey">
+			<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
+			{{if  .OldRef }}
+				{{if .NewRef }}
+					{{$.i18n.Tr "repo.issues.change_branch_tag_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
+				{{else}}
+					{{$.i18n.Tr "repo.issues.remove_branch_at" (.OldRef|Escape) $createdStr | Safe}}
+				{{end}}
+			{{else}}
+				{{if  .NewRef}}
+				{{ $getRefType:= GetRefType .NewRef }}
+				{{$getRefType}}
+					{{$.i18n.Tr "repo.issues.add_branch_at" (.NewRef|Escape) $createdStr | Safe}}
+				{{end}}
+			{{end}}
+		</span>
+	</div>
 	{{end}}
 {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index a08656702..19022020a 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -14,7 +14,7 @@
 					<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
 				</div>
 				
-				<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
+				<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_branch_tag"}}</div>
 
 				<div class="header">
 					<div class="ui grid">