diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/BoxAnswerPayload.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/BoxAnswerPayload.java
index 2b54734..52f326e 100644
--- a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/BoxAnswerPayload.java
+++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/BoxAnswerPayload.java
@@ -8,7 +8,7 @@ public final class BoxAnswerPayload {
 
     public static final ContextKey<Boolean> DISABLE_WEB_PAGE_PREVIEW = ContextKey.of("DISABLE_WEB_PAGE_PREVIEW", Boolean.class);
     public static final ContextKey<Boolean> DISABLE_NOTIFICATION = ContextKey.of("DISABLE_NOTIFICATION", Boolean.class);
-    public static final ContextKey<Boolean> ENABLE_MARKDOWN = ContextKey.of("DISABLE_MARKDOWN", Boolean.class);
+    public static final ContextKey<Boolean> ENABLE_MARKDOWN = ContextKey.of("ENABLE_MARKDOWN", Boolean.class);
     public static final ContextKey<SendInvoice> INVOICE = ContextKey.of("INVOICE", SendInvoice.class);
 
     private BoxAnswerPayload() {
diff --git a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramPollingBot.java b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramPollingBot.java
index 64df833..f2ec6cf 100644
--- a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramPollingBot.java
+++ b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramPollingBot.java
@@ -11,11 +11,6 @@ import org.telegram.telegrambots.meta.bots.AbsSender;
 
 import static dev.struchkov.haiti.utils.Checker.checkNotNull;
 
-/**
- * TODO: Добавить описание класса.
- *
- * @author upagge [15/07/2019]
- */
 public class TelegramPollingBot extends TelegramLongPollingBot implements TelegramBot {
 
     private final TelegramBotConfig telegramBotConfig;
diff --git a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
index 527c4aa..315134a 100644
--- a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
+++ b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java
@@ -182,9 +182,10 @@ public class TelegramSender implements TelegramSending {
                             return Uni.createFrom().completionStage(executeAsync(editMessageText))
                                     .onItem().ifNotNull().transform(t -> {
                                         final SentBox sentBox = new SentBox();
+                                        sentBox.setPersonId(telegramId);
+                                        sentBox.setMessageId(lastMessageId);
                                         sentBox.setSentAnswer(boxAnswer);
                                         sentBox.setOriginalAnswer(boxAnswer);
-                                        sentBox.setMessageId(telegramId);
                                         return sentBox;
                                     })
                                     .onFailure(TelegramApiRequestException.class).recoverWithUni(