2 files changed, 3 insertions, 3 deletions
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index edc547eb..ef0291c0 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -292,7 +292,7 @@ public class XMPPConnection implements AutoCloseable {
             }
         }
         com.juick.Message fullMsg = messagesService.getMessage(jmsg.getMid());
-        String txt = "@" + jmsg.getUser().getName() + ":" + fullMsg.getTagsString() + "\n";
+        String txt = "@" + jmsg.getUser().getName() + ":" + MessageUtils.getTagsString(fullMsg) + "\n";
         String attachmentUrl = MessageUtils.attachmentUrl(fullMsg);
         if (StringUtils.isNotEmpty(attachmentUrl)) {
             txt += attachmentUrl + "\n";
@@ -362,7 +362,7 @@ public class XMPPConnection implements AutoCloseable {
                 recomm.getMid(), jmsg.getUser().getUid());
 
         String txt = "Recommended by @" + recomm.getUser().getName() + ":\n";
-        txt += "@" + jmsg.getUser().getName() + ":" + jmsg.getTagsString() + "\n";
+        txt += "@" + jmsg.getUser().getName() + ":" + MessageUtils.getTagsString(jmsg) + "\n";
         String attachmentUrl = MessageUtils.attachmentUrl(jmsg);
         if (StringUtils.isNotEmpty(attachmentUrl)) {
             txt += attachmentUrl + "\n";
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java b/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java
index 3ee458c8..7be9ec09 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java
+++ b/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java
@@ -109,7 +109,7 @@ public class MessagesView extends AbstractRssFeedView {
     private Item createRssItem(Message msg) {
         Item item = new Item();
         String messageUrl = String.format("http://juick.com/%s/%d", msg.getUser().getName(), msg.getMid());
-        String messageTitle = String.format("@%s: %s", msg.getUser().getName(), msg.getTagsString());
+        String messageTitle = String.format("@%s: %s", msg.getUser().getName(), MessageUtils.getTagsString(msg));
         boolean isCode = msg.getTags().stream().anyMatch(t -> t.getName().equals("code"));
         String messageDescription = isCode ? MessageUtils.formatMessageCode(StringUtils.defaultString(msg.getText()))
                 : MessageUtils.formatMessage(StringUtils.defaultString(msg.getText()));