/****************************************************************
 * 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.jpa.mail.model.openjpa;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;

import javax.mail.Flags;
import javax.mail.internet.SharedInputStream;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Lob;
import javax.persistence.Table;

import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.Externalizer;
import org.apache.openjpa.persistence.Factory;

@Entity(name="Message")
@Table(name="JAMES_MAIL")
public class JPAEncryptedMessage extends AbstractJPAMessage {

        /** The value for the body field. Lazy loaded */
        /** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
        @Basic(optional = false, fetch = FetchType.LAZY)
        @Column(name = "MAIL_BYTES", length = 1048576000, nullable = false)
        @Externalizer("EncryptDecryptHelper.getEncrypted")
        @Factory("EncryptDecryptHelper.getDecrypted")
        @Lob private byte[] body;


        /** The value for the header field. Lazy loaded */
        /** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
        @Basic(optional = false, fetch = FetchType.LAZY)
        @Column(name = "HEADER_BYTES", length = 10485760, nullable = false)
        @Externalizer("EncryptDecryptHelper.getEncrypted")
        @Factory("EncryptDecryptHelper.getDecrypted")
        @Lob private byte[] header;
        
        @Deprecated
        public JPAEncryptedMessage() {}

        public JPAEncryptedMessage(JPAMailbox mailbox,Date internalDate, int size, Flags flags, SharedInputStream content, int bodyStartOctet, final PropertyBuilder propertyBuilder) throws MailboxException {
            super(mailbox, internalDate, flags, size ,bodyStartOctet, propertyBuilder);
            try {
                int headerEnd = bodyStartOctet -2;
                if (headerEnd < 0) {
                    headerEnd = 0;
                }
                this.header = IOUtils.toByteArray(content.newStream(0, headerEnd));
                this.body = IOUtils.toByteArray(content.newStream(getBodyStartOctet(), -1));

            } catch (IOException e) {
                throw new MailboxException("Unable to parse message",e);
            }
        }

        /**
         * Create a copy of the given message
         * 
         * @param message
         * @throws MailboxException 
         */
        public JPAEncryptedMessage(JPAMailbox mailbox, long uid, long modSeq, Message<?> message) throws MailboxException{
            super(mailbox, uid, modSeq, message);
            try {
                this.body = IOUtils.toByteArray(message.getBodyContent());
                this.header = IOUtils.toByteArray(message.getHeaderContent());
            } catch (IOException e) {
                throw new MailboxException("Unable to parse message",e);
            }
        }


        /*
         * (non-Javadoc)
         * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
         */
        public InputStream getBodyContent() throws IOException {
            return new ByteArrayInputStream(body);
        }

        /*
         * (non-Javadoc)
         * @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
         */
        public InputStream getHeaderContent() throws IOException {
            return new ByteArrayInputStream(header);
        }

}

@@ -3418,11 +3418,8 @@
 ctet
- -2
 ;%0A  

Make sure the header/body seperator is included in getHeaderContent()