diff --git a/src/Misd/Linkify/Linkify.php b/src/Misd/Linkify/Linkify.php
index 870bd38..af7bd55 100644
--- a/src/Misd/Linkify/Linkify.php
+++ b/src/Misd/Linkify/Linkify.php
@@ -160,7 +160,7 @@ protected function linkifyUrls($text, $options = array('attr' => ''))
                 |                                    #   or
                 [^\s`!\-()\[\]{};:\'".,<>?«»“”‘’]    # not a space or one of these punct chars
               )
-        ~';
+        ~u';
 
         $callback = function ($match) use ($options) {
             $caption = $match[0];
@@ -201,7 +201,7 @@ protected function linkifyEmails($text, $options = array('attr' => ''))
                 [A-Z0-9.-]+      # Domain
                 \.               # Dot
                 [A-Z]{2,4}       # Something
-        ~';
+        ~u';
 
         $callback = function ($match) use ($options) {
             if (isset($options['callback'])) {
diff --git a/tests/data/email.json b/tests/data/email.json
index 5edc6d2..6562f22 100644
--- a/tests/data/email.json
+++ b/tests/data/email.json
@@ -46,6 +46,14 @@
             "test": "example@example.example.com.",
             "expected": "<a href=\"mailto:example@example.example.com\">example@example.example.com</a>."
         },
+        {
+            "test": "example@example.example.com　",
+            "expected": "<a href=\"mailto:example@example.example.com\">example@example.example.com</a>　"
+        },
+        {
+            "test": "Привет example@example.com!",
+            "expected": "Привет <a href=\"mailto:example@example.com\">example@example.com</a>!"
+        },
         {
             "test": "(example@example.com)",
             "expected": "(<a href=\"mailto:example@example.com\">example@example.com</a>)"
diff --git a/tests/data/url.json b/tests/data/url.json
index 50b3421..2dcfc71 100644
--- a/tests/data/url.json
+++ b/tests/data/url.json
@@ -38,6 +38,14 @@
             "test": "http://www.example.com/example/",
             "expected": "<a href=\"http://www.example.com/example/\">http://www.example.com/example/</a>"
         },
+        {
+            "test": "www.example.com　",
+            "expected": "<a href=\"http://www.example.com\">www.example.com</a>　"
+        },
+        {
+            "test": "Линк: https://ru.wikipedia.org/wiki/Футбол",
+            "expected": "Линк: <a href=\"https://ru.wikipedia.org/wiki/Футбол\">https://ru.wikipedia.org/wiki/Футбол</a>"
+        },
         {
             "test": "(http://www.example.com/)",
             "expected": "(<a href=\"http://www.example.com/\">http://www.example.com/</a>)"