diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index 00e1acbae..7dde2eaa7 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -91,8 +91,10 @@ class InputBar extends StatelessWidget {
     //   }
     // }
     // Pangea#
-    final emojiMatch =
-        RegExp(r'(?:\s|^):(?:([-\w]+)~)?([-\w]+)$').firstMatch(searchText);
+    final emojiMatch = RegExp(
+      r'(?:\s|^):(?:([\p{L}\p{N}_-]+)~)?([\p{L}\p{N}_-]+)$',
+      unicode: true,
+    ).firstMatch(searchText);
     if (emojiMatch != null) {
       final packSearch = emojiMatch[1];
       final emoteSearch = emojiMatch[2]!.toLowerCase();
diff --git a/lib/pages/chat/start_poll_bottom_sheet.dart b/lib/pages/chat/start_poll_bottom_sheet.dart
index fd14c4186..3fc5acc6a 100644
--- a/lib/pages/chat/start_poll_bottom_sheet.dart
+++ b/lib/pages/chat/start_poll_bottom_sheet.dart
@@ -81,9 +81,9 @@ class _StartPollBottomSheetState extends State<StartPollBottomSheet> {
         children: [
           TextField(
             controller: _bodyController,
-            minLines: 1,
+            minLines: 2,
             maxLines: 4,
-            maxLength: 512,
+            maxLength: 1024,
             onChanged: _updateCanCreate,
             decoration: InputDecoration(
               hintText: L10n.of(context).pollQuestion,