diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index 4bbe2b4b1cb..3c02090df8a 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -37,6 +37,8 @@ class tinymce_texteditor extends texteditor {
             return true;
         } else if (check_browser_version('Safari iOS')) {
             return false;
+        } else if (check_browser_version('Android WebKit')) {
+            return false;
         } else if (check_browser_version('Safari', 3)) {
             return true;
         } else if (check_browser_version('Opera', 9)) {
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index b4e5dcbbc8f..ca3addd8f1f 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7606,6 +7606,15 @@ function check_php_version($version='5.2.4') {
           if (strpos($agent, 'iPad')) {
               return true;
           }
+          if (strpos($agent, 'iPod')) {
+              return true;
+          }
+          break;
+
+      case 'Android WebKit':  /// WebKit browser on Android
+          if (strpos($agent, 'Linux; U; Android')) {
+              return true;
+          }
           break;
 
     }