diff --git a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java
index cbc1f23..4d53190 100644
--- a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java
+++ b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java
@@ -129,7 +129,12 @@ public final class MessageMailConvert {
     private static Optional<Attachment> convertEntity(Message message, MessageEntity entity) {
         switch (entity.getType()) {
             case "text_link" -> {
-                return Optional.of(new LinkAttachment(entity.getUrl()));
+                return Optional.of(entity.getUrl())
+                        .map(LinkAttachment::new);
+            }
+            case "url" -> {
+                return Optional.of(entity.getText())
+                        .map(LinkAttachment::new);
             }
             case "bot_command" -> {
                 final String commandValue = entity.getText();
diff --git a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java
index 4a82eca..b02ce58 100644
--- a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java
+++ b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java
@@ -31,4 +31,8 @@ public class TriggerChecks {
         return mail -> Attachments.findFirstButtonClick(mail.getAttachments()).isPresent();
     }
 
+    public static Predicate<Mail> isLinks() {
+        return mail -> Attachments.findFirstLink(mail.getAttachments()).isPresent();
+    }
+
 }