1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/juick/CommandsManager.java b/src/main/java/com/juick/CommandsManager.java
index d389deaa..a0f6e5e5 100644
--- a/src/main/java/com/juick/CommandsManager.java
+++ b/src/main/java/com/juick/CommandsManager.java
@@ -545,7 +545,7 @@ public class CommandsManager {
             }
         }
         Pair<String, Set<Tag>> messageTags = tagService.fromString(txt);
-        if (user.getUid() == msg.get().getUser().getUid() && rid == 0 && messageTags.getRight().size() > 0) {
+        if (user.getUid() == msg.get().getUser().getUid() && rid == 0 && !messageTags.getRight().isEmpty()) {
             var updatedTags = tagService.updateTags(mid, messageTags.getRight());
             if (!CollectionUtils.isEqualCollection(updatedTags, msg.get().getTags())) {
                 messagesService.setReadOnly(msg.get().getMid(), TagUtils.hasTag(updatedTags, "readonly"));
@@ -554,6 +554,9 @@ public class CommandsManager {
                 return CommandResult.fromString("Tags are NOT updated (5 tags maximum?)");
             }
         } else {
+            if (!user.isVerified()) {
+                return CommandResult.fromString("Please, verify your account at https://juick.com/settings");
+            }
             if (!messagesService.canViewThread(mid, user.getUid())) {
                 return CommandResult.fromString("Message unavailable");
             }