diff --git a/app/definitions/redux/index.ts b/app/definitions/redux/index.ts
index 86512f252..558882b46 100644
--- a/app/definitions/redux/index.ts
+++ b/app/definitions/redux/index.ts
@@ -60,7 +60,7 @@ export type TApplicationActions = TActionActiveUsers &
 	TActionEncryption &
 	TActionSortPreferences &
 	TActionUserTyping &
-	TActionCreateDiscussion&
+	TActionCreateDiscussion &
 	TActionCreateChannel &
 	TActionsShare &
 	TActionServer &
diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx
index adda3e803..ce154bd18 100644
--- a/app/views/ThreadMessagesView/index.tsx
+++ b/app/views/ThreadMessagesView/index.tsx
@@ -220,7 +220,6 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 				.query(...whereClause)
 				.observeWithColumns(['updated_at']);
 
-			// TODO: Refactor when migrate messages
 			this.messagesSubscription = this.messagesObservable.subscribe(messages => {
 				const { currentFilter } = this.state;
 				const displayingThreads = this.getFilteredThreads(messages, subscription, currentFilter);