diff --git a/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift b/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift
index 81e814d0d..e0b1b38e1 100644
--- a/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift
+++ b/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift
@@ -77,7 +77,7 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable {
         contentView.addSubview(badgeView)
         badgeView.snp.makeConstraints { make in
             make.centerY.equalTo(dateLabel)
-            make.right.equalTo(dateLabel.snp.left).offset(-Styles.Sizes.columnSpacing)
+            make.right.equalTo(-40)
         }
     }
 
diff --git a/Local Pods/DateAgo/DateAgo/Date+AgoString.swift b/Local Pods/DateAgo/DateAgo/Date+AgoString.swift
index 7dd210098..43d0f48eb 100644
--- a/Local Pods/DateAgo/DateAgo/Date+AgoString.swift	
+++ b/Local Pods/DateAgo/DateAgo/Date+AgoString.swift	
@@ -32,7 +32,12 @@ public extension Date {
         case .future:
             return NSLocalizedString("in the future", bundle: Date.bundle, comment: "")
         case .seconds:
-            return NSLocalizedString("just now", bundle: Date.bundle, comment: "")
+            switch format {
+            case .long:
+                return NSLocalizedString("just now", bundle: Date.bundle, comment: "")
+            case .short:
+                return NSLocalizedString("now", bundle: Date.bundle, comment: "")
+            }
         case .minutes(let t):
             switch format {
             case .long: