                     let repostAuthor = repost.author,
                     let source = repost.repostSource
                 {
-                    return style(author)
-                        .append(style(" commented on "))
-                        .append(style(repostAuthor))
-                        .append(style("’s "))
-                        .append(style("repost", repost))
-                        .append(style(" of your "))
-                        .append(style("post", source))
-                        .append(style("."))
+                    return styleUser(author)
+                        .append(styleText(" commented on "))
+                        .append(styleUser(repostAuthor))
+                        .append(styleText("’s "))
+                        .append(stylePost("repost", repost))
+                        .append(styleText(" of your "))
+                        .append(stylePost("post", source))
+                        .append(styleText("."))
                 }
                 else {
-                    return style(author)
-                        .append(style(" commented on your post"))
+                    return styleUser(author)
+                        .append(styleText(" commented on your post"))
                 }
             case .CommentOnRepostNotification:
                 if let comment = subject as? ElloComment {
-                    return style(author)
-                        .append(style(" commented on your "))
-                        .append(style("repost", comment))
-                        .append(style("."))
+                    return styleUser(author)
+                        .append(styleText(" commented on your "))
+                        .append(styleComment("repost", comment))
+                        .append(styleText("."))
                 }
                 else {
-                    return style(author)
-                        .append(style(" commented on your repost"))
+                    return styleUser(author)
+                        .append(styleText(" commented on your repost"))
                 }
             case .InvitationAcceptedPost:
-                return style(author)
-                    .append(style(" accepted your invitation."))
+                return styleUser(author)
+                    .append(styleText(" accepted your invitation."))
             case .LoveNotification:
                 if let love = subject as? Love,
                     let post = love.post
                 {
-                    return style(author)
-                        .append(style(" loved your "))
-                        .append(style("post", post))
-                        .append(style("."))
+                    return styleUser(author)
+                        .append(styleText(" loved your "))
+                        .append(stylePost("post", post))
+                        .append(styleText("."))
                 }
                 else {
-                    return style(author).append(style(" loved your post."))
+                    return styleUser(author).append(styleText(" loved your post."))
                 }
             case .LoveOnRepostNotification:
                 if let love = subject as? Love,
                     let post = love.post
                 {
-                    return style(author)
-                        .append(style(" loved your "))
-                        .append(style("repost", post))
-                        .append(style("."))
+                    return styleUser(author)
+                        .append(styleText(" loved your "))
+                        .append(stylePost("repost", post))
+                        .append(styleText("."))
                 }
                 else {
-                    return style(author).append(style(" loved your repost."))
+                    return styleUser(author).append(styleText(" loved your repost."))
                 }
             case .LoveOnOriginalPostNotification:
                 if let love = subject as? Love,

            ]))
        }
        else {
            return style("Someone")
        }
    }

    static private func style(text: String, _ post: Post) -> NSAttributedString {
        let attrs = self.attrs([
            ElloAttributedText.Link: "post",
            ElloAttributedText.Object: post,

        return attrs + addlAttrs
    }

    static private func styleText(text: String) -> NSAttributedString {
        return NSAttributedString(string: text, attributes: attrs())
    }

    static private func styleUser(user: User?) -> NSAttributedString {
        if let user = user {
            return NSAttributedString(string: user.atName, attributes: attrs([
                ElloAttributedText.Link: "user",
