1 files changed, 19 insertions, 17 deletions
diff --git a/src/main/java/com/juick/Message.java b/src/main/java/com/juick/Message.java
index 3d2b8227f..4db2620ea 100644
--- a/src/main/java/com/juick/Message.java
+++ b/src/main/java/com/juick/Message.java
@@ -150,23 +150,25 @@ public class Message {
 
     public String getTagsString() {
         String ret = "";
-        for (int i = 0; i < Tags.size(); i++) {
-            ret += " *" + Tags.get(i);
-        }
-        if (FriendsOnly) {
-            ret += " *friends";
-        }
-        if (Privacy == -2) {
-            ret += " *private";
-        }
-        if (Privacy == -1) {
-            ret += " *friends";
-        }
-        if (Privacy == 2) {
-            ret += " *public";
-        }
-        if (ReadOnly) {
-            ret += " *readonly";
+        if (!Tags.isEmpty()) {
+            for (int i = 0; i < Tags.size(); i++) {
+                ret += " *" + Tags.get(i);
+            }
+            if (FriendsOnly) {
+                ret += " *friends";
+            }
+            if (Privacy == -2) {
+                ret += " *private";
+            }
+            if (Privacy == -1) {
+                ret += " *friends";
+            }
+            if (Privacy == 2) {
+                ret += " *public";
+            }
+            if (ReadOnly) {
+                ret += " *readonly";
+            }
         }
         return ret;
     }