diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index f73c8b0f..b62d7f37 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -322,6 +322,9 @@ func (b *Btelegram) handleEdit(msg *config.Message, chatid int64) (string, error
 	case "Markdown":
 		b.Log.Debug("Using mode markdown")
 		m.ParseMode = tgbotapi.ModeMarkdown
+	case "MarkdownV2":
+		b.Log.Debug("Using mode MarkdownV2")
+		m.ParseMode = "MarkdownV2"
 	}
 	if strings.ToLower(b.GetString("MessageFormat")) == HTMLNick {
 		b.Log.Debug("Using mode HTML - nick only")
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index ac45985e..dde573b3 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -126,6 +126,10 @@ func (b *Btelegram) sendMessage(chatid int64, username, text string) (string, er
 		b.Log.Debug("Using mode markdown")
 		m.ParseMode = tgbotapi.ModeMarkdown
 	}
+	if b.GetString("MessageFormat") == "MarkdownV2" {
+		b.Log.Debug("Using mode MarkdownV2")
+		m.ParseMode = "MarkdownV2"
+	}
 	if strings.ToLower(b.GetString("MessageFormat")) == HTMLNick {
 		b.Log.Debug("Using mode HTML - nick only")
 		m.Text = username + html.EscapeString(text)