diff --git a/dropbox.php b/dropbox.php
index 95b3a07..3e63e2e 100644
--- a/dropbox.php
+++ b/dropbox.php
@@ -314,7 +314,7 @@ class dropbox
      **/
     public function media($path, $root='dropbox')
     {
-        $path = str_replace(' ', '%20', $path);
+	$path = implode("/", array_map("rawurlencode", explode("/", $path)));
         return $this->_response_request("/media/{$root}/{$path}");
     }
     
@@ -472,4 +472,4 @@ class dropbox
     }
 }
 
-?>
\ No newline at end of file
+?>