X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMIME.java;h=477ce639049228da8e82b67d0993918946a755c8;hb=43b53fd9e204f99ff18101c029e8c3a3a7cf5763;hp=5b62faaaf148b2755f20a2b58ad0738c9e66d557;hpb=f91f71f3897e6b72c81d889397ccb972c6cff11d;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/MIME.java b/src/org/ibex/mail/MIME.java index 5b62faa..477ce63 100644 --- a/src/org/ibex/mail/MIME.java +++ b/src/org/ibex/mail/MIME.java @@ -56,11 +56,10 @@ public class MIME { ctype = "application/octet-stream"; } this.contentType = new ContentType(ctype, headers.get("content-description"), headers.get("content-id"), encoding); - final long bodylength = fount.getLength() - h.getLength() - 2; /*CRLF*/ // FIXME: this is a horrible, tangled mess. this.body = new Fountain() { - public int getNumLines() { return Stream.countLines(getStream()); } - public long getLength() { return bodylength; } + public int getNumLines() { return Stream.countLines(this.getStream()); } + public long getLength() { return Stream.countBytes(this.getStream()); } public Stream getStream() { return transformBodyStream(Headers.skip(fount.getStream())); } }; this.all =