diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py
index 593052d18..91fa0a798 100644
--- a/modoboa/extensions/webmail/lib.py
+++ b/modoboa/extensions/webmail/lib.py
@@ -291,9 +291,9 @@ class ImapEmail(Email):
         for cid, params in self.bs.inlines.iteritems():
             if re.search("\.\.", cid):
                 continue
-            fname = "media/webmail/%s_%s" % (self.mailid, cid)
-            path = os.path.join(settings.MODOBOA_DIR, fname)
-            params["fname"] = "/%s" % fname
+            fname = "webmail/%s_%s" % (self.mailid, cid)
+            path = os.path.join(settings.MEDIA_ROOT, fname)
+            params["fname"] = settings.MEDIA_URL+"/%s" % fname
             if os.path.exists(path):
                 continue