diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/MessageMailConvert.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/MessageMailConvert.java
index ac1bc66..0056800 100644
--- a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/MessageMailConvert.java
+++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/MessageMailConvert.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import static dev.struchkov.haiti.utils.Checker.checkNotBlank;
 import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
 
 /**
@@ -46,7 +47,7 @@ public final class MessageMailConvert {
         final Long chatId = message.getChatId();
         mail.setId(message.getMessageId().toString());
         mail.setFromPersonId(chatId != null ? chatId.toString() : null);
-        mail.setText(message.getText());
+        mail.setText(getText(message));
         mail.setCreateDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(message.getDate()), ZoneId.systemDefault()));
 
         final Chat chat = message.getChat();
@@ -71,6 +72,16 @@ public final class MessageMailConvert {
         return mail;
     }
 
+    private static String getText(Message message) {
+        if (checkNotBlank(message.getText())) {
+            return message.getText();
+        }
+        if (checkNotBlank(message.getCaption())) {
+            return message.getCaption();
+        }
+        return null;
+    }
+
     private static Optional<Attachment> convertPhoto(List<PhotoSize> photoSizes) {
         if (photoSizes != null && !photoSizes.isEmpty()) {
             final PictureGroupAttachment attachment = new PictureGroupAttachment();