diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index b0c275cc..8be1c26a 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -291,6 +291,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 50d23943..58815163 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -4,6 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter_highlighter/flutter_highlighter.dart';
 import 'package:flutter_highlighter/themes/shades-of-purple.dart';
 import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_html_table/flutter_html_table.dart';
 import 'package:flutter_math_fork/flutter_math.dart';
 import 'package:matrix/matrix.dart';
 
@@ -91,6 +92,19 @@ class HtmlMessage extends StatelessWidget {
         'hr': Style(
           border: Border.all(color: textColor, width: 0.5),
         ),
+        'table': Style(
+          border: Border.all(color: textColor, width: 0.5),
+        ),
+        'tr': Style(
+          border: Border.all(color: textColor, width: 0.5),
+        ),
+        'td': Style(
+          border: Border.all(color: textColor, width: 0.5),
+          padding: const EdgeInsets.all(2),
+        ),
+        'th': Style(
+          border: Border.all(color: textColor, width: 0.5),
+        ),
       },
       extensions: [
         UserPillExtension(context, room),
@@ -99,6 +113,7 @@ class HtmlMessage extends StatelessWidget {
         MatrixMathExtension(
           style: TextStyle(fontSize: fontSize, color: textColor),
         ),
+        const TableHtmlExtension(),
       ],
       onLinkTap: (url, _, __) => UrlLauncher(context, url).launchUrl(),
       onlyRenderTheseTags: const {
diff --git a/pubspec.lock b/pubspec.lock
index 807fb978..ec892686 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -459,6 +459,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0-beta.1"
+  flutter_html_table:
+    dependency: "direct main"
+    description:
+      name: flutter_html_table
+      sha256: "0fd718e55dcd280c25b18beb01c491147525e7bebe73d6973b9a7bde9c4dcc9a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0-beta.1"
   flutter_keyboard_visibility:
     dependency: transitive
     description:
@@ -507,6 +515,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  flutter_layout_grid:
+    dependency: transitive
+    description:
+      name: flutter_layout_grid
+      sha256: "31728ce6e9c8eaa48f8a3f928a7c308da4b74ab867aec2dc5b80b0c9f9b79d0d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   flutter_linkify:
     dependency: "direct main"
     description:
@@ -1406,6 +1422,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
   random_string:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 4f8aa044..6e9257bc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,6 +35,7 @@ dependencies:
   flutter_foreground_task: ^3.10.0
   flutter_highlighter: ^0.1.1
   flutter_html: ^3.0.0-beta.1
+  flutter_html_table: ^3.0.0-beta.1
   flutter_linkify: ^6.0.0
   flutter_local_notifications: ^12.0.2
   flutter_localizations: