diff --git a/src/main.js b/src/main.js
index 7dae78d5..69b409a8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc6',
+	major: 4, minor: 0, revision: 0, extra: '-rc6.1',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 83cfe6de..5e289218 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -129,7 +129,8 @@ export default class Chat extends Module {
 				data: [
 					{value: 0, title: 'Do Not Remove'},
 					{value: 1, title: 'Remove Unseen (Default)'},
-					{value: 2, title: 'Remove All'}
+					{value: 2, title: 'Remove Unseen as Moderator'},
+					{value: 3, title: 'Remove All'}
 				]
 			}
 		});
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index cb7114b7..a353b29f 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -583,8 +583,11 @@ export default class ChatHook extends Module {
 							if ( this.moderatedUsers.has(login) )
 								return;
 
-							const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 2,
+							const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 3,
 								do_update = m => {
+									if ( m.event )
+										m = m.event;
+
 									if ( m.type === types.Message && m.user && m.user.userLogin === login )
 										m.deleted = true;
 								};
@@ -607,7 +610,7 @@ export default class ChatHook extends Module {
 							if ( t.chat.context.get('chat.filtering.ignore-clear') )
 								msg = {
 									type: types.Notice,
-									message: 'An attempt to clear chat was ignored.'
+									message: t.i18n.t('chat.ignore-clear', 'An attempt to clear chat was ignored.')
 								}
 
 						}
@@ -626,13 +629,13 @@ export default class ChatHook extends Module {
 				raw_delay = t.chat.context.get('chat.delay'),
 				delay = raw_delay === -1 ? this.delayDuration : raw_delay,
 				first = now - delay,
-				do_remove = t.chat.context.get('chat.filtering.remove-deleted') !== 0;
+				do_remove = t.chat.context.get('chat.filtering.remove-deleted');
 
 			let changed = false;
 
 			for(const msg of this.delayedMessageBuffer) {
 				if ( msg.time <= first || ! msg.shouldDelay ) {
-					if ( do_remove && ! this.shouldSeeBlockedAndDeletedMessages && this.isDeletable(msg.event) && msg.event.deleted )
+					if ( do_remove !== 0 && (do_remove > 1 || ! this.shouldSeeBlockedAndDeletedMessages) && this.isDeletable(msg.event) && msg.event.deleted )
 						continue;
 
 					this.buffer.push(msg.event);