/****************************************************************
 * Licensed to the Apache Software Foundation (ASF) under one   *
 * or more contributor license agreements.  See the NOTICE file *
 * distributed with this work for additional information        *
 * regarding copyright ownership.  The ASF licenses this file   *
 * to you under the Apache License, Version 2.0 (the            *
 * "License"); you may not use this file except in compliance   *
 * with the License.  You may obtain a copy of the License at   *
 *                                                              *
 *   http://www.apache.org/licenses/LICENSE-2.0                 *
 *                                                              *
 * Unless required by applicable law or agreed to in writing,   *
 * software distributed under the License is distributed on an  *
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
 * KIND, either express or implied.  See the License for the    *
 * specific language governing permissions and limitations      *
 * under the License.                                           *
 ****************************************************************/

package org.apache.james.mailbox.store.streaming;

import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;

/**
 * {@link FilterInputStream} implementation which skip the given bytes as late as possible.
 * 
 *
 */
public class LazySkippingInputStream extends FilterInputStream{

    private long skipBytes;
    private boolean skipped = false;

    /**
     * Construct the {@link LazySkippingInputStream}
     * 
     * @param in {@link InputStream} to wrap
     * @param skipBytes bytes to skip
     */
    public LazySkippingInputStream(InputStream in, long skipBytes) {
        super(in);
        this.skipBytes = skipBytes;
    }

    @Override
    public int read() throws IOException {
        skipIfNeeded();

        return super.read();
    }

    @Override
    public int read(byte[] b, int off, int len) throws IOException {
        skipIfNeeded();
        return super.read(b, off, len);
    }

    @Override
    public int read(byte[] b) throws IOException {
        skipIfNeeded();
        return super.read(b);
    }
    
    @Override
    public int available() throws IOException {
        skipIfNeeded();

        return super.available();
    }

    @Override
    public synchronized void mark(int readlimit) {
        // not supported
    }

    @Override
    public boolean markSupported() {
        return false;
    }

    @Override
    public long skip(long n) throws IOException {
        skipIfNeeded();
        return super.skip(n);
    }

    /**
     * Check if the bytes are skipped already. If not do now
     * 
     * @throws IOException
     */
    private void skipIfNeeded() throws IOException {
        if (skipped == false) {
            super.skip(skipBytes);
            skipped = true;
        }
    }
    
    public InputStream getWrapped() throws IOException {
        return in;
    }
    
    public long getSkippedBytes() {
        return skipBytes;
    }

}

@@ -1350,16 +1350,57 @@
 eam;%0D%0A%0D%0A
+import org.apache.commons.io.IOUtils;%0D%0A%0D%0A
 /**%0D%0A * 
@@ -2527,20 +2527,8 @@
 lic 
-synchronized
  voi
@@ -3019,27 +3019,38 @@
         
-super.skip(
+IOUtils.skipFully(in, 
 skipByte

Make sure LazySkippingInputStream does skip all needed bytes. See MAILBOX-95