diff --git a/appimage/Extera.AppDir/bundle/data/flutter_assets/NOTICES.Z b/appimage/Extera.AppDir/bundle/data/flutter_assets/NOTICES.Z
index 51c691b..3b406c5 100644
Binary files a/appimage/Extera.AppDir/bundle/data/flutter_assets/NOTICES.Z and b/appimage/Extera.AppDir/bundle/data/flutter_assets/NOTICES.Z differ
diff --git a/appimage/Extera.AppDir/bundle/data/flutter_assets/version.json b/appimage/Extera.AppDir/bundle/data/flutter_assets/version.json
index c578de2..2a0a6a4 100644
--- a/appimage/Extera.AppDir/bundle/data/flutter_assets/version.json
+++ b/appimage/Extera.AppDir/bundle/data/flutter_assets/version.json
@@ -1 +1 @@
-{"app_name":"extera_next","version":"2.0.1","package_name":"extera_next"}
\ No newline at end of file
+{"app_name":"extera_next","version":"2.1.0","package_name":"extera_next"}
\ No newline at end of file
diff --git a/appimage/Extera.AppDir/bundle/extera_next b/appimage/Extera.AppDir/bundle/extera_next
index fcc8c70..757859a 100755
Binary files a/appimage/Extera.AppDir/bundle/extera_next and b/appimage/Extera.AppDir/bundle/extera_next differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libapp.so b/appimage/Extera.AppDir/bundle/lib/libapp.so
index d398166..1cdc1e3 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libapp.so and b/appimage/Extera.AppDir/bundle/lib/libapp.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libdesktop_drop_plugin.so b/appimage/Extera.AppDir/bundle/lib/libdesktop_drop_plugin.so
index 0cfdc62..d254ac7 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libdesktop_drop_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libdesktop_drop_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libdynamic_color_plugin.so b/appimage/Extera.AppDir/bundle/lib/libdynamic_color_plugin.so
index 0fd22d8..fa0e961 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libdynamic_color_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libdynamic_color_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libemoji_picker_flutter_plugin.so b/appimage/Extera.AppDir/bundle/lib/libemoji_picker_flutter_plugin.so
index bebd365..5f96bf1 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libemoji_picker_flutter_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libemoji_picker_flutter_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libfile_selector_linux_plugin.so b/appimage/Extera.AppDir/bundle/lib/libfile_selector_linux_plugin.so
index 5e78878..0e711f6 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libfile_selector_linux_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libfile_selector_linux_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libflutter_linux_gtk.so b/appimage/Extera.AppDir/bundle/lib/libflutter_linux_gtk.so
index 00bb1a8..2a30dbb 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libflutter_linux_gtk.so and b/appimage/Extera.AppDir/bundle/lib/libflutter_linux_gtk.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libflutter_secure_storage_linux_plugin.so b/appimage/Extera.AppDir/bundle/lib/libflutter_secure_storage_linux_plugin.so
index 4759d19..1bd4859 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libflutter_secure_storage_linux_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libflutter_secure_storage_linux_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libflutter_webrtc_plugin.so b/appimage/Extera.AppDir/bundle/lib/libflutter_webrtc_plugin.so
index 0135e10..98b9aea 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libflutter_webrtc_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libflutter_webrtc_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libgtk_plugin.so b/appimage/Extera.AppDir/bundle/lib/libgtk_plugin.so
index da9a983..b7e9701 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libgtk_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libgtk_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libhandy_flutter.so b/appimage/Extera.AppDir/bundle/lib/libhandy_flutter.so
index e783d91..e3651c6 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libhandy_flutter.so and b/appimage/Extera.AppDir/bundle/lib/libhandy_flutter.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libhandy_window_plugin.so b/appimage/Extera.AppDir/bundle/lib/libhandy_window_plugin.so
index d20758a..22aa08a 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libhandy_window_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libhandy_window_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libpasteboard_plugin.so b/appimage/Extera.AppDir/bundle/lib/libpasteboard_plugin.so
index 7f9781a..16c7b63 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libpasteboard_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libpasteboard_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/librecord_linux_plugin.so b/appimage/Extera.AppDir/bundle/lib/librecord_linux_plugin.so
index c1e1ee2..d7a7ea7 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/librecord_linux_plugin.so and b/appimage/Extera.AppDir/bundle/lib/librecord_linux_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libsqlcipher_flutter_libs_plugin.so b/appimage/Extera.AppDir/bundle/lib/libsqlcipher_flutter_libs_plugin.so
index 84df94e..e13dd31 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libsqlcipher_flutter_libs_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libsqlcipher_flutter_libs_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/liburl_launcher_linux_plugin.so b/appimage/Extera.AppDir/bundle/lib/liburl_launcher_linux_plugin.so
index 7137a19..21bfe4f 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/liburl_launcher_linux_plugin.so and b/appimage/Extera.AppDir/bundle/lib/liburl_launcher_linux_plugin.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libvodozemac_bindings_dart.so b/appimage/Extera.AppDir/bundle/lib/libvodozemac_bindings_dart.so
index 2c547ec..a11a004 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libvodozemac_bindings_dart.so and b/appimage/Extera.AppDir/bundle/lib/libvodozemac_bindings_dart.so differ
diff --git a/appimage/Extera.AppDir/bundle/lib/libwindow_to_front_plugin.so b/appimage/Extera.AppDir/bundle/lib/libwindow_to_front_plugin.so
index f535034..53ed837 100644
Binary files a/appimage/Extera.AppDir/bundle/lib/libwindow_to_front_plugin.so and b/appimage/Extera.AppDir/bundle/lib/libwindow_to_front_plugin.so differ
diff --git a/lib/pages/chat/events/poll_content.dart b/lib/pages/chat/events/poll_content.dart
index 33fb26b..4c93a76 100644
--- a/lib/pages/chat/events/poll_content.dart
+++ b/lib/pages/chat/events/poll_content.dart
@@ -217,7 +217,7 @@ class PollWidgetState extends State<PollWidget> {
     final isDisclosed = kind == 'org.matrix.msc3381.disclosed';
     final isEnded = _isPollEnded();
 
-    return isDisclosed ? (isEnded || hasVoted) : isEnded;
+    return isDisclosed || isEnded;
   }
 
   double _getAnswerPercentage(String answerId) {
@@ -254,7 +254,7 @@ class PollWidgetState extends State<PollWidget> {
     final event = widget.event;
     final content =
         event.content[PollEvents.PollStart] as Map<String, dynamic?>;
-    final question = content?['question']?['m.text'] as String? ?? 'Poll';
+    final question = content?['question']?['m.text'] as String? ?? content?['question']?['org.matrix.msc1767.text'] as String? ?? content?['question']?['body'] as String? ?? 'Poll';
     final List<dynamic> answers = content?['answers'] ?? [];
     final maxSelections = content?['max_selections'] as int? ?? 1;
     final kind = content?['kind'] as String?;