diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index dae070a45..7b1c1a052 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -598,7 +598,7 @@ def find_images_in_body(body): if src is None: continue o = urlparse(src) - dirname = os.path.dirncme(o.path).replace(settings.MEDIA_URL, "") + dirname = os.path.dirname(o.path).replace(settings.MEDIA_URL, "") fname = os.path.basename(o.path) cid = "%s@modoboa" % os.path.splitext(fname)[0] tag.set("src", "cid:%s" % cid) diff --git a/extensions/webmail/static/css/webmail.css b/extensions/webmail/static/css/webmail.css index 2a9fea2e0..c8585f42a 100644 --- a/extensions/webmail/static/css/webmail.css +++ b/extensions/webmail/static/css/webmail.css @@ -197,13 +197,13 @@ textarea:hover { #box { /*border: 1px solid #ccc; */ width: 200px; - background: url(../pics/progressbar_bg.gif) right center no-repeat; + background: url(../../pics/progressbar_bg.gif) right center no-repeat; height: 19px; float: left; } #perc { - background: url(../pics/progressbar.gif) right center no-repeat; + background: url(../../pics/progressbar.gif) right center no-repeat; height: 19px; } diff --git a/lib/email_listing.py b/lib/email_listing.py index 25da6cb0d..9e3f1d26c 100644 --- a/lib/email_listing.py +++ b/lib/email_listing.py @@ -180,7 +180,8 @@ class Email(object): text, html, calendar, etc. All those contents can be displayed inside a navigator. """ - if msg.get_content_subtype() == "calendar": + if msg.get_content_subtype() not in ["plain", "html"]: + self.__parse_default(msg, level) target = "plain" else: target = msg.get_content_subtype()