diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index 40fdc1c2cb2..155d1093e6e 100644
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -25,9 +25,10 @@ function mediaplugin_filter($courseid, $text) {
             if (!empty($THEME->filter_mediaplugin_colors)) {
                 $c = $THEME->filter_mediaplugin_colors;   // You can set this up in your theme/xxx/config.php
             } else {
-                $c = 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff';
+                $c = 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff&waitForPlay=yes&';
             }
         }
+        $c = htmlentities($c);
         $search = '/<a(.*?)href=\"([^<]+)\.mp3\"([^>]*)>(.*?)<\/a>/i';
 
         $replace  = '\\0&nbsp;<object class="mediaplugin mp3" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';
@@ -36,11 +37,11 @@ function mediaplugin_filter($courseid, $text) {
         $replace .= " <param name=\"movie\" value=\"$CFG->wwwroot/filter/mediaplugin/mp3player.swf?src=\\2.mp3\" />";
         $replace .= ' <param name="quality" value="high" />';
         $replace .= ' <param name="bgcolor" value="#333333" />';
-        $replace .= ' <param name="flashvars" value="'.$c.'&amp;" />';
+        $replace .= ' <param name="flashvars" value="'.$c.'" />';
         $replace .= " <embed src=\"$CFG->wwwroot/filter/mediaplugin/mp3player.swf?src=\\2.mp3\" ";
         $replace .= "  quality=\"high\" bgcolor=\"#333333\" width=\"90\" height=\"15\" name=\"mp3player\" ";
         $replace .= ' type="application/x-shockwave-flash" ';
-        $replace .= ' flashvars="'.$c.'&amp;" ';
+        $replace .= ' flashvars="'.$c.'" ';
         $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">';
         $replace .= '</embed>';
         $replace .= '</object>&nbsp;';
diff --git a/filter/mediaplugin/mp3player.fla.zip b/filter/mediaplugin/mp3player.fla.zip
index f3e06be7286..6f99c881955 100644
Binary files a/filter/mediaplugin/mp3player.fla.zip and b/filter/mediaplugin/mp3player.fla.zip differ
diff --git a/filter/mediaplugin/mp3player.swf b/filter/mediaplugin/mp3player.swf
index 6c0017d0333..140c0554001 100755
Binary files a/filter/mediaplugin/mp3player.swf and b/filter/mediaplugin/mp3player.swf differ