diff --git a/assets/i18n/strings_en.i18n.json b/assets/i18n/strings_en.i18n.json
index 38af23ba..d8d4b90c 100644
--- a/assets/i18n/strings_en.i18n.json
+++ b/assets/i18n/strings_en.i18n.json
@@ -174,7 +174,9 @@
             "login": "Login"
         },
         "home": {
-            "addAccount": "Add new account"
+            "addAccount": "Add new account",
+            "searchNoResults": "No search results...",
+            "chat": "Chat"
         },
         "conversations": {
             "speeddialNewChat": "New chat",
diff --git a/lib/ui/pages/home/home.dart b/lib/ui/pages/home/home.dart
index b813f4f9..0e57ff57 100644
--- a/lib/ui/pages/home/home.dart
+++ b/lib/ui/pages/home/home.dart
@@ -258,23 +258,6 @@ class ConversationsPageState extends State<ConversationsPage>
             _conversationKeys[item.jid] = key;
           }
 
-          // TODO: Port the rest
-          /*final row = ConversationsListRow(
-            item,
-            true,
-            enableAvatarOnTap: true,
-            isSelected: _selectedConversation?.jid == item.jid,
-            onPressed: () {
-              GetIt.I.get<ConversationBloc>().add(
-                    RequestedConversationEvent(
-                      item.jid,
-                      item.title,
-                      item.avatarPath,
-                    ),
-                  );
-            },
-            key: key,
-          );*/
           final row = ConversationCard(
             conversation: item,
             highlightWord: highlightWord,
@@ -350,8 +333,7 @@ class ConversationsPageState extends State<ConversationsPage>
             child: Text(
               hasSearchResults
                   ?
-                  // TODO: i18n
-                  'No search results...'
+                  t.pages.home.searchNoResults
                   : t.pages.conversations.noOpenChats,
             ),
           ),
@@ -475,8 +457,7 @@ class ConversationsPageState extends State<ConversationsPage>
           ),
           floatingActionButton: FloatingActionButton.extended(
             onPressed: () => Navigator.pushNamed(context, newConversationRoute),
-            // TODO: i18n
-            label: const Text('Chat'),
+            label: Text(t.pages.home.chat),
             icon: const Icon(Icons.chat_outlined),
             backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
             foregroundColor: Theme.of(context).colorScheme.onSecondaryContainer,