diff --git a/otouto/bot.lua b/otouto/bot.lua
index 6569714..0756878 100755
--- a/otouto/bot.lua
+++ b/otouto/bot.lua
@@ -88,6 +88,10 @@ function bot:on_msg_receive(msg, config) -- The fn run whenever a message is rec
 	msg.text = msg.text or msg.caption or ''
 	msg.text_lower = msg.text:lower()
 
+	if msg.reply_to_message then
+		msg.reply_to_message.text = msg.reply_to_message.text or msg.reply_to_message.caption or ''
+	end
+
 	-- Support deep linking.
 	if msg.text:match('^'..config.cmd_pat..'start .+') then
 		msg.text = config.cmd_pat .. utilities.input(msg.text)
diff --git a/otouto/plugins/blacklist.lua b/otouto/plugins/blacklist.lua
index 33cebb7..281ddb5 100755
--- a/otouto/plugins/blacklist.lua
+++ b/otouto/plugins/blacklist.lua
@@ -4,6 +4,7 @@
 local blacklist = {}
 
 local utilities = require('otouto.utilities')
+local bindings = require('otouto.bindings')
 
 function blacklist:init()
 	if not self.database.blacklist then
@@ -15,8 +16,13 @@ blacklist.triggers = {
 	''
 }
 
+blacklist.error = false
+
 function blacklist:action(msg, config)
-	if self.database.blacklist[tostring(msg.from.id)] or self.database.blacklist[tostring(msg.chat.id)] then
+	if self.database.blacklist[tostring(msg.from.id)] then
+		return
+	elseif self.database.blacklist[tostring(msg.chat.id)] then
+		bindings.leaveChat(self, { chat_id = msg.chat.id })
 		return
 	end
 	if not (