Implemented java serialization

72 files changed, 245 insertions, 24 deletions

diff --git a/src/java/TypesUtils.cpp b/src/java/TypesUtils.cpp
index 8d4b96b4..e79c4745 100644
--- a/src/java/TypesUtils.cpp
+++ b/src/java/TypesUtils.cpp
@@ -11,7 +11,7 @@ using namespace mailcore;
 static chash * cppClassHash = NULL;
 static chash * javaClassHash = NULL;
 
-#define RANGE_MAX (1 >> 63 - 1)
+#define RANGE_MAX (1ULL >> 63ULL - 1ULL)
 
 static void init(void);
 static void real_init(void);
diff --git a/src/java/com/libmailcore/Address.java b/src/java/com/libmailcore/Address.java
index 81a5386b..36f48c97 100644
--- a/src/java/com/libmailcore/Address.java
+++ b/src/java/com/libmailcore/Address.java
@@ -29,4 +29,6 @@ public class Address extends NativeObject {
     public native String nonEncodedRFC822String();
     
     private native void setupNative();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/IMAPMessage.java b/src/java/com/libmailcore/IMAPMessage.java
index 05328e79..80860afc 100644
--- a/src/java/com/libmailcore/IMAPMessage.java
+++ b/src/java/com/libmailcore/IMAPMessage.java
@@ -50,4 +50,6 @@ public class IMAPMessage extends AbstractMessage {
     {
         return htmlRendering(folder, dataCallback, null);
     }
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/IMAPMessagePart.java b/src/java/com/libmailcore/IMAPMessagePart.java
index e6060154..50126cc4 100644
--- a/src/java/com/libmailcore/IMAPMessagePart.java
+++ b/src/java/com/libmailcore/IMAPMessagePart.java
@@ -3,4 +3,6 @@ package com.libmailcore;
 public class IMAPMessagePart extends AbstractMessagePart {
     public native void setPartID(String partID);
     public native String partID();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/IMAPMessagesRequestKind.java b/src/java/com/libmailcore/IMAPMessagesRequestKind.java
new file mode 100644
index 00000000..a30f45c9
--- /dev/null
+++ b/src/java/com/libmailcore/IMAPMessagesRequestKind.java
@@ -0,0 +1,16 @@
+package com.libmailcore;
+
+public class IMAPMessagesRequestKind {
+    public final static int IMAPMessagesRequestKindUid = 0;
+    public final static int IMAPMessagesRequestKindFlags = 1 << 0;
+    public final static int IMAPMessagesRequestKindHeaders = 1 << 1;
+    public final static int IMAPMessagesRequestKindStructure = 1 << 2;
+    public final static int IMAPMessagesRequestKindInternalDate = 1 << 3;
+    public final static int IMAPMessagesRequestKindFullHeaders = 1 << 4;
+    public final static int IMAPMessagesRequestKindHeaderSubject = 1 << 5;
+    public final static int IMAPMessagesRequestKindGmailLabels = 1 << 6;
+    public final static int IMAPMessagesRequestKindGmailMessageID = 1 << 7;
+    public final static int IMAPMessagesRequestKindGmailThreadID = 1 << 8;
+    public final static int IMAPMessagesRequestKindExtraHeaders = 1 << 9;
+    public final static int IMAPMessagesRequestKindSize = 1 << 10;
+}
diff --git a/src/java/com/libmailcore/IMAPMultipart.java b/src/java/com/libmailcore/IMAPMultipart.java
index 79819be3..5e30815e 100644
--- a/src/java/com/libmailcore/IMAPMultipart.java
+++ b/src/java/com/libmailcore/IMAPMultipart.java
@@ -4,4 +4,6 @@ public class IMAPMultipart extends AbstractMultipart {
     public native void setPartID(String partID);
     public native String partID();
     private native void setupNative();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/IMAPPart.java b/src/java/com/libmailcore/IMAPPart.java
index 753f05a0..27765f41 100644
--- a/src/java/com/libmailcore/IMAPPart.java
+++ b/src/java/com/libmailcore/IMAPPart.java
@@ -11,4 +11,6 @@ public class IMAPPart extends AbstractPart {
     
     public native void setEncoding(int encoding);
     public native int encoding();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/IndexSet.java b/src/java/com/libmailcore/IndexSet.java
index ed48fdb1..78e9a84f 100644
--- a/src/java/com/libmailcore/IndexSet.java
+++ b/src/java/com/libmailcore/IndexSet.java
@@ -29,4 +29,6 @@ public class IndexSet extends NativeObject {
     public native void removeAllIndexes();
     
     private native void setupNative();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/MessageHeader.java b/src/java/com/libmailcore/MessageHeader.java
index c203a5bc..89f44694 100644
--- a/src/java/com/libmailcore/MessageHeader.java
+++ b/src/java/com/libmailcore/MessageHeader.java
@@ -69,4 +69,6 @@ public class MessageHeader extends NativeObject {
     public native MessageHeader forwardHeader();
     
     private native void setupNative();
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/java/com/libmailcore/NativeObject.java b/src/java/com/libmailcore/NativeObject.java
index d90b7283..a1923056 100644
--- a/src/java/com/libmailcore/NativeObject.java
+++ b/src/java/com/libmailcore/NativeObject.java
@@ -1,8 +1,10 @@
 package com.libmailcore;
 
 import java.util.Map;
+import java.io.Serializable;
+import java.io.IOException;
 
-public class NativeObject implements Cloneable {
+public class NativeObject implements Cloneable, Serializable {
     protected void finalize() throws Throwable
     {
         super.finalize();
@@ -13,12 +15,26 @@ public class NativeObject implements Cloneable {
     private native void unsetupNative();
     public native String toString();
     public native Object clone() throws CloneNotSupportedException;
-    
-    protected native Map serializable();
-    public static native NativeObject objectWithSerializable(Map serializable);
 
     private long nativeHandle;
-    
+
+    private static final long serialVersionUID = 1L;
+
+    protected void writeObject(java.io.ObjectOutputStream out) throws IOException {
+        byte[] data = serializableData();
+        out.writeInt(data.length);
+        out.write(data, 0, data.length);
+    }
+
+    protected void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+        int len = in.readInt();
+        byte[] data = new byte[len];
+        in.read(data, 0, len);
+    }
+
+    private native byte[] serializableData();
+    private native void importSerializableData(byte[] data);
+
     static {
         MainThreadUtils.singleton();
     }
diff --git a/src/java/com/libmailcore/Range.java b/src/java/com/libmailcore/Range.java
index 3d7cb7b6..d81e9fbc 100644
--- a/src/java/com/libmailcore/Range.java
+++ b/src/java/com/libmailcore/Range.java
@@ -22,4 +22,8 @@ public class Range {
     public native String toString();
     
     public static native Range rangeWithString(String rangeString);
+
+    static {
+        MainThreadUtils.singleton();
+    }
 }
\ No newline at end of file
diff --git a/src/java/native/com_libmailcore_AbstractMessage.h b/src/java/native/com_libmailcore_AbstractMessage.h
index bdb17a69..409fe627 100644
--- a/src/java/native/com_libmailcore_AbstractMessage.h
+++ b/src/java/native/com_libmailcore_AbstractMessage.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_AbstractMessage_serialVersionUID
+#define com_libmailcore_AbstractMessage_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_AbstractMessage
  * Method:    header
diff --git a/src/java/native/com_libmailcore_AbstractMessagePart.h b/src/java/native/com_libmailcore_AbstractMessagePart.h
index 67530cc4..559351a1 100644
--- a/src/java/native/com_libmailcore_AbstractMessagePart.h
+++ b/src/java/native/com_libmailcore_AbstractMessagePart.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_AbstractMessagePart_serialVersionUID
+#define com_libmailcore_AbstractMessagePart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_AbstractMessagePart
  * Method:    header
diff --git a/src/java/native/com_libmailcore_AbstractMultipart.h b/src/java/native/com_libmailcore_AbstractMultipart.h
index 59a73c33..ce3c2287 100644
--- a/src/java/native/com_libmailcore_AbstractMultipart.h
+++ b/src/java/native/com_libmailcore_AbstractMultipart.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_AbstractMultipart_serialVersionUID
+#define com_libmailcore_AbstractMultipart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_AbstractMultipart
  * Method:    parts
diff --git a/src/java/native/com_libmailcore_AbstractPart.h b/src/java/native/com_libmailcore_AbstractPart.h
index e6c41c6a..eeb076af 100644
--- a/src/java/native/com_libmailcore_AbstractPart.h
+++ b/src/java/native/com_libmailcore_AbstractPart.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_AbstractPart_serialVersionUID
+#define com_libmailcore_AbstractPart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_AbstractPart
  * Method:    partType
diff --git a/src/java/native/com_libmailcore_Address.h b/src/java/native/com_libmailcore_Address.h
index 6bc5f042..0069267e 100644
--- a/src/java/native/com_libmailcore_Address.h
+++ b/src/java/native/com_libmailcore_Address.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_Address_serialVersionUID
+#define com_libmailcore_Address_serialVersionUID 1LL
+#undef com_libmailcore_Address_serialVersionUID
+#define com_libmailcore_Address_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_Address
  * Method:    addressWithDisplayName
diff --git a/src/java/native/com_libmailcore_Attachment.h b/src/java/native/com_libmailcore_Attachment.h
index 2fc98aa5..1030f437 100644
--- a/src/java/native/com_libmailcore_Attachment.h
+++ b/src/java/native/com_libmailcore_Attachment.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_Attachment_serialVersionUID
+#define com_libmailcore_Attachment_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_Attachment
  * Method:    mimeTypeForFilename
diff --git a/src/java/native/com_libmailcore_IMAPAppendMessageOperation.h b/src/java/native/com_libmailcore_IMAPAppendMessageOperation.h
index 8a71fe39..2f649547 100644
--- a/src/java/native/com_libmailcore_IMAPAppendMessageOperation.h
+++ b/src/java/native/com_libmailcore_IMAPAppendMessageOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPAppendMessageOperation_serialVersionUID
+#define com_libmailcore_IMAPAppendMessageOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPAppendMessageOperation
  * Method:    setDate
diff --git a/src/java/native/com_libmailcore_IMAPCapabilityOperation.h b/src/java/native/com_libmailcore_IMAPCapabilityOperation.h
index 3e510561..6fa6d418 100644
--- a/src/java/native/com_libmailcore_IMAPCapabilityOperation.h
+++ b/src/java/native/com_libmailcore_IMAPCapabilityOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPCapabilityOperation_serialVersionUID
+#define com_libmailcore_IMAPCapabilityOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPCapabilityOperation
  * Method:    capabilities
diff --git a/src/java/native/com_libmailcore_IMAPCopyMessagesOperation.h b/src/java/native/com_libmailcore_IMAPCopyMessagesOperation.h
index 46ff67de..24b1b5c0 100644
--- a/src/java/native/com_libmailcore_IMAPCopyMessagesOperation.h
+++ b/src/java/native/com_libmailcore_IMAPCopyMessagesOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPCopyMessagesOperation_serialVersionUID
+#define com_libmailcore_IMAPCopyMessagesOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPCopyMessagesOperation
  * Method:    uidMapping
diff --git a/src/java/native/com_libmailcore_IMAPFetchContentOperation.h b/src/java/native/com_libmailcore_IMAPFetchContentOperation.h
index 5262050a..2c93f8cf 100644
--- a/src/java/native/com_libmailcore_IMAPFetchContentOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFetchContentOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFetchContentOperation_serialVersionUID
+#define com_libmailcore_IMAPFetchContentOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFetchContentOperation
  * Method:    data
diff --git a/src/java/native/com_libmailcore_IMAPFetchFoldersOperation.h b/src/java/native/com_libmailcore_IMAPFetchFoldersOperation.h
index 22b72f98..a46b292a 100644
--- a/src/java/native/com_libmailcore_IMAPFetchFoldersOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFetchFoldersOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFetchFoldersOperation_serialVersionUID
+#define com_libmailcore_IMAPFetchFoldersOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFetchFoldersOperation
  * Method:    folders
diff --git a/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.h b/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.h
index d13cf269..a45629a4 100644
--- a/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFetchMessagesOperation_serialVersionUID
+#define com_libmailcore_IMAPFetchMessagesOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFetchMessagesOperation
  * Method:    messages
diff --git a/src/java/native/com_libmailcore_IMAPFetchNamespaceOperation.h b/src/java/native/com_libmailcore_IMAPFetchNamespaceOperation.h
index bd6350e5..011c7fb8 100644
--- a/src/java/native/com_libmailcore_IMAPFetchNamespaceOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFetchNamespaceOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFetchNamespaceOperation_serialVersionUID
+#define com_libmailcore_IMAPFetchNamespaceOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFetchNamespaceOperation
  * Method:    namespaces
diff --git a/src/java/native/com_libmailcore_IMAPFetchParsedContentOperation.h b/src/java/native/com_libmailcore_IMAPFetchParsedContentOperation.h
index d371da78..f950ed6e 100644
--- a/src/java/native/com_libmailcore_IMAPFetchParsedContentOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFetchParsedContentOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFetchParsedContentOperation_serialVersionUID
+#define com_libmailcore_IMAPFetchParsedContentOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFetchParsedContentOperation
  * Method:    parser
diff --git a/src/java/native/com_libmailcore_IMAPFolder.h b/src/java/native/com_libmailcore_IMAPFolder.h
index e4475662..eec72365 100644
--- a/src/java/native/com_libmailcore_IMAPFolder.h
+++ b/src/java/native/com_libmailcore_IMAPFolder.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFolder_serialVersionUID
+#define com_libmailcore_IMAPFolder_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFolder
  * Method:    setPath
diff --git a/src/java/native/com_libmailcore_IMAPFolderInfo.h b/src/java/native/com_libmailcore_IMAPFolderInfo.h
index ae9d52a7..cc66a3df 100644
--- a/src/java/native/com_libmailcore_IMAPFolderInfo.h
+++ b/src/java/native/com_libmailcore_IMAPFolderInfo.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFolderInfo_serialVersionUID
+#define com_libmailcore_IMAPFolderInfo_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFolderInfo
  * Method:    uidNext
diff --git a/src/java/native/com_libmailcore_IMAPFolderInfoOperation.h b/src/java/native/com_libmailcore_IMAPFolderInfoOperation.h
index 19e432c0..a11850de 100644
--- a/src/java/native/com_libmailcore_IMAPFolderInfoOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFolderInfoOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFolderInfoOperation_serialVersionUID
+#define com_libmailcore_IMAPFolderInfoOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFolderInfoOperation
  * Method:    info
diff --git a/src/java/native/com_libmailcore_IMAPFolderStatus.h b/src/java/native/com_libmailcore_IMAPFolderStatus.h
index 72c70c01..949e9a14 100644
--- a/src/java/native/com_libmailcore_IMAPFolderStatus.h
+++ b/src/java/native/com_libmailcore_IMAPFolderStatus.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFolderStatus_serialVersionUID
+#define com_libmailcore_IMAPFolderStatus_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFolderStatus
  * Method:    setUnseenCount
diff --git a/src/java/native/com_libmailcore_IMAPFolderStatusOperation.h b/src/java/native/com_libmailcore_IMAPFolderStatusOperation.h
index 84641e69..af9e245a 100644
--- a/src/java/native/com_libmailcore_IMAPFolderStatusOperation.h
+++ b/src/java/native/com_libmailcore_IMAPFolderStatusOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPFolderStatusOperation_serialVersionUID
+#define com_libmailcore_IMAPFolderStatusOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPFolderStatusOperation
  * Method:    status
diff --git a/src/java/native/com_libmailcore_IMAPIdentity.h b/src/java/native/com_libmailcore_IMAPIdentity.h
index e4ad1108..ed5b7b4a 100644
--- a/src/java/native/com_libmailcore_IMAPIdentity.h
+++ b/src/java/native/com_libmailcore_IMAPIdentity.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPIdentity_serialVersionUID
+#define com_libmailcore_IMAPIdentity_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPIdentity
  * Method:    setVendor
diff --git a/src/java/native/com_libmailcore_IMAPIdentityOperation.h b/src/java/native/com_libmailcore_IMAPIdentityOperation.h
index 19dafc2f..56dc7502 100644
--- a/src/java/native/com_libmailcore_IMAPIdentityOperation.h
+++ b/src/java/native/com_libmailcore_IMAPIdentityOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPIdentityOperation_serialVersionUID
+#define com_libmailcore_IMAPIdentityOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPIdentityOperation
  * Method:    serverIdentity
diff --git a/src/java/native/com_libmailcore_IMAPIdleOperation.h b/src/java/native/com_libmailcore_IMAPIdleOperation.h
index 4db3db6e..7cef6737 100644
--- a/src/java/native/com_libmailcore_IMAPIdleOperation.h
+++ b/src/java/native/com_libmailcore_IMAPIdleOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPIdleOperation_serialVersionUID
+#define com_libmailcore_IMAPIdleOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPIdleOperation
  * Method:    interruptIdle
diff --git a/src/java/native/com_libmailcore_IMAPMessage.h b/src/java/native/com_libmailcore_IMAPMessage.h
index aaf287c8..c075e5cc 100644
--- a/src/java/native/com_libmailcore_IMAPMessage.h
+++ b/src/java/native/com_libmailcore_IMAPMessage.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPMessage_serialVersionUID
+#define com_libmailcore_IMAPMessage_serialVersionUID 1LL
+#undef com_libmailcore_IMAPMessage_serialVersionUID
+#define com_libmailcore_IMAPMessage_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPMessage
  * Method:    sequenceNumber
diff --git a/src/java/native/com_libmailcore_IMAPMessagePart.h b/src/java/native/com_libmailcore_IMAPMessagePart.h
index 31675977..a302e3f8 100644
--- a/src/java/native/com_libmailcore_IMAPMessagePart.h
+++ b/src/java/native/com_libmailcore_IMAPMessagePart.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPMessagePart_serialVersionUID
+#define com_libmailcore_IMAPMessagePart_serialVersionUID 1LL
+#undef com_libmailcore_IMAPMessagePart_serialVersionUID
+#define com_libmailcore_IMAPMessagePart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPMessagePart
  * Method:    setPartID
diff --git a/src/java/native/com_libmailcore_IMAPMessageRenderingOperation.h b/src/java/native/com_libmailcore_IMAPMessageRenderingOperation.h
index e2afd390..e59c2c50 100644
--- a/src/java/native/com_libmailcore_IMAPMessageRenderingOperation.h
+++ b/src/java/native/com_libmailcore_IMAPMessageRenderingOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPMessageRenderingOperation_serialVersionUID
+#define com_libmailcore_IMAPMessageRenderingOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPMessageRenderingOperation
  * Method:    result
diff --git a/src/java/native/com_libmailcore_IMAPMessagesRequestKind.h b/src/java/native/com_libmailcore_IMAPMessagesRequestKind.h
new file mode 100644
index 00000000..eb98f668
--- /dev/null
+++ b/src/java/native/com_libmailcore_IMAPMessagesRequestKind.h
@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_libmailcore_IMAPMessagesRequestKind */
+
+#ifndef _Included_com_libmailcore_IMAPMessagesRequestKind
+#define _Included_com_libmailcore_IMAPMessagesRequestKind
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindUid
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindUid 0L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindFlags
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindFlags 1L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindHeaders
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindHeaders 2L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindStructure
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindStructure 4L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindInternalDate
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindInternalDate 8L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindFullHeaders
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindFullHeaders 16L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindHeaderSubject
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindHeaderSubject 32L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailLabels
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailLabels 64L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailMessageID
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailMessageID 128L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailThreadID
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindGmailThreadID 256L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindExtraHeaders
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindExtraHeaders 512L
+#undef com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindSize
+#define com_libmailcore_IMAPMessagesRequestKind_IMAPMessagesRequestKindSize 1024L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/java/native/com_libmailcore_IMAPMultipart.h b/src/java/native/com_libmailcore_IMAPMultipart.h
index 3aec59b6..f2cad6ad 100644
--- a/src/java/native/com_libmailcore_IMAPMultipart.h
+++ b/src/java/native/com_libmailcore_IMAPMultipart.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPMultipart_serialVersionUID
+#define com_libmailcore_IMAPMultipart_serialVersionUID 1LL
+#undef com_libmailcore_IMAPMultipart_serialVersionUID
+#define com_libmailcore_IMAPMultipart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPMultipart
  * Method:    setPartID
diff --git a/src/java/native/com_libmailcore_IMAPNamespace.h b/src/java/native/com_libmailcore_IMAPNamespace.h
index 5ffa4a79..3f773b32 100644
--- a/src/java/native/com_libmailcore_IMAPNamespace.h
+++ b/src/java/native/com_libmailcore_IMAPNamespace.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPNamespace_serialVersionUID
+#define com_libmailcore_IMAPNamespace_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPNamespace
  * Method:    mainPrefix
diff --git a/src/java/native/com_libmailcore_IMAPNamespaceItem.h b/src/java/native/com_libmailcore_IMAPNamespaceItem.h
index 13f6ac0d..7f94a99a 100644
--- a/src/java/native/com_libmailcore_IMAPNamespaceItem.h
+++ b/src/java/native/com_libmailcore_IMAPNamespaceItem.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPNamespaceItem_serialVersionUID
+#define com_libmailcore_IMAPNamespaceItem_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPNamespaceItem
  * Method:    setPrefix
diff --git a/src/java/native/com_libmailcore_IMAPOperation.h b/src/java/native/com_libmailcore_IMAPOperation.h
index b93ecceb..216622ea 100644
--- a/src/java/native/com_libmailcore_IMAPOperation.h
+++ b/src/java/native/com_libmailcore_IMAPOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPOperation_serialVersionUID
+#define com_libmailcore_IMAPOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPOperation
  * Method:    errorCode
diff --git a/src/java/native/com_libmailcore_IMAPPart.h b/src/java/native/com_libmailcore_IMAPPart.h
index 283fcec9..f434c7cc 100644
--- a/src/java/native/com_libmailcore_IMAPPart.h
+++ b/src/java/native/com_libmailcore_IMAPPart.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPPart_serialVersionUID
+#define com_libmailcore_IMAPPart_serialVersionUID 1LL
+#undef com_libmailcore_IMAPPart_serialVersionUID
+#define com_libmailcore_IMAPPart_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPPart
  * Method:    setPartID
diff --git a/src/java/native/com_libmailcore_IMAPQuotaOperation.h b/src/java/native/com_libmailcore_IMAPQuotaOperation.h
index 3ff29f22..dd211409 100644
--- a/src/java/native/com_libmailcore_IMAPQuotaOperation.h
+++ b/src/java/native/com_libmailcore_IMAPQuotaOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPQuotaOperation_serialVersionUID
+#define com_libmailcore_IMAPQuotaOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPQuotaOperation
  * Method:    usage
diff --git a/src/java/native/com_libmailcore_IMAPSearchExpression.h b/src/java/native/com_libmailcore_IMAPSearchExpression.h
index 29853074..88b321e4 100644
--- a/src/java/native/com_libmailcore_IMAPSearchExpression.h
+++ b/src/java/native/com_libmailcore_IMAPSearchExpression.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPSearchExpression_serialVersionUID
+#define com_libmailcore_IMAPSearchExpression_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPSearchExpression
  * Method:    searchAll
diff --git a/src/java/native/com_libmailcore_IMAPSearchOperation.h b/src/java/native/com_libmailcore_IMAPSearchOperation.h
index 2204afe8..9c1594b3 100644
--- a/src/java/native/com_libmailcore_IMAPSearchOperation.h
+++ b/src/java/native/com_libmailcore_IMAPSearchOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPSearchOperation_serialVersionUID
+#define com_libmailcore_IMAPSearchOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPSearchOperation
  * Method:    uids
diff --git a/src/java/native/com_libmailcore_IMAPSession.h b/src/java/native/com_libmailcore_IMAPSession.h
index 1096feae..8d6ee73c 100644
--- a/src/java/native/com_libmailcore_IMAPSession.h
+++ b/src/java/native/com_libmailcore_IMAPSession.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IMAPSession_serialVersionUID
+#define com_libmailcore_IMAPSession_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IMAPSession
  * Method:    setHostname
diff --git a/src/java/native/com_libmailcore_IndexSet.h b/src/java/native/com_libmailcore_IndexSet.h
index 536caf53..f68328b6 100644
--- a/src/java/native/com_libmailcore_IndexSet.h
+++ b/src/java/native/com_libmailcore_IndexSet.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_IndexSet_serialVersionUID
+#define com_libmailcore_IndexSet_serialVersionUID 1LL
+#undef com_libmailcore_IndexSet_serialVersionUID
+#define com_libmailcore_IndexSet_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_IndexSet
  * Method:    indexSet
diff --git a/src/java/native/com_libmailcore_MessageBuilder.h b/src/java/native/com_libmailcore_MessageBuilder.h
index e57f235c..a4c992ee 100644
--- a/src/java/native/com_libmailcore_MessageBuilder.h
+++ b/src/java/native/com_libmailcore_MessageBuilder.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_MessageBuilder_serialVersionUID
+#define com_libmailcore_MessageBuilder_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_MessageBuilder
  * Method:    setHTMLBody
diff --git a/src/java/native/com_libmailcore_MessageHeader.h b/src/java/native/com_libmailcore_MessageHeader.h
index 0a40c0c8..1cff222f 100644
--- a/src/java/native/com_libmailcore_MessageHeader.h
+++ b/src/java/native/com_libmailcore_MessageHeader.h
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_MessageHeader_serialVersionUID
+#define com_libmailcore_MessageHeader_serialVersionUID 1LL
+#undef com_libmailcore_MessageHeader_serialVersionUID
+#define com_libmailcore_MessageHeader_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_MessageHeader
  * Method:    messageID
diff --git a/src/java/native/com_libmailcore_MessageParser.h b/src/java/native/com_libmailcore_MessageParser.h
index ba6098eb..0bc13720 100644
--- a/src/java/native/com_libmailcore_MessageParser.h
+++ b/src/java/native/com_libmailcore_MessageParser.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_MessageParser_serialVersionUID
+#define com_libmailcore_MessageParser_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_MessageParser
  * Method:    messageParserWithData
diff --git a/src/java/native/com_libmailcore_MessagePart.h b/src/java/native/com_libmailcore_MessagePart.h
index 3067f720..2bdfebbb 100644
--- a/src/java/native/com_libmailcore_MessagePart.h
+++ b/src/java/native/com_libmailcore_MessagePart.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_MessagePart_serialVersionUID
+#define com_libmailcore_MessagePart_serialVersionUID 1LL
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/java/native/com_libmailcore_Multipart.h b/src/java/native/com_libmailcore_Multipart.h
index 0ab64d29..b9622415 100644
--- a/src/java/native/com_libmailcore_Multipart.h
+++ b/src/java/native/com_libmailcore_Multipart.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_Multipart_serialVersionUID
+#define com_libmailcore_Multipart_serialVersionUID 1LL
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/java/native/com_libmailcore_NNTPFetchAllArticlesOperation.h b/src/java/native/com_libmailcore_NNTPFetchAllArticlesOperation.h
index 94a75558..73423539 100644
--- a/src/java/native/com_libmailcore_NNTPFetchAllArticlesOperation.h
+++ b/src/java/native/com_libmailcore_NNTPFetchAllArticlesOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPFetchAllArticlesOperation_serialVersionUID
+#define com_libmailcore_NNTPFetchAllArticlesOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPFetchAllArticlesOperation
  * Method:    articles
diff --git a/src/java/native/com_libmailcore_NNTPFetchArticleOperation.h b/src/java/native/com_libmailcore_NNTPFetchArticleOperation.h
index 233015ff..7913cc9c 100644
--- a/src/java/native/com_libmailcore_NNTPFetchArticleOperation.h
+++ b/src/java/native/com_libmailcore_NNTPFetchArticleOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPFetchArticleOperation_serialVersionUID
+#define com_libmailcore_NNTPFetchArticleOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPFetchArticleOperation
  * Method:    data
diff --git a/src/java/native/com_libmailcore_NNTPFetchHeaderOperation.h b/src/java/native/com_libmailcore_NNTPFetchHeaderOperation.h
index 78ea44f8..247e5ac8 100644
--- a/src/java/native/com_libmailcore_NNTPFetchHeaderOperation.h
+++ b/src/java/native/com_libmailcore_NNTPFetchHeaderOperation.h
@@ -7,12 +7,14 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPFetchHeaderOperation_serialVersionUID
+#define com_libmailcore_NNTPFetchHeaderOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPFetchHeaderOperation
- * Method:    data
- * Signature: ()[B
+ * Method:    header
+ * Signature: ()Lcom/libmailcore/MessageHeader;
  */
-JNIEXPORT jbyteArray JNICALL Java_com_libmailcore_NNTPFetchHeaderOperation_data
+JNIEXPORT jobject JNICALL Java_com_libmailcore_NNTPFetchHeaderOperation_header
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
diff --git a/src/java/native/com_libmailcore_NNTPFetchOverviewOperation.h b/src/java/native/com_libmailcore_NNTPFetchOverviewOperation.h
index 8b7afb0d..65cbc52c 100644
--- a/src/java/native/com_libmailcore_NNTPFetchOverviewOperation.h
+++ b/src/java/native/com_libmailcore_NNTPFetchOverviewOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPFetchOverviewOperation_serialVersionUID
+#define com_libmailcore_NNTPFetchOverviewOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPFetchOverviewOperation
  * Method:    articles
diff --git a/src/java/native/com_libmailcore_NNTPFetchServerTimeOperation.h b/src/java/native/com_libmailcore_NNTPFetchServerTimeOperation.h
index 687eac4d..3f45732b 100644
--- a/src/java/native/com_libmailcore_NNTPFetchServerTimeOperation.h
+++ b/src/java/native/com_libmailcore_NNTPFetchServerTimeOperation.h
@@ -7,12 +7,14 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPFetchServerTimeOperation_serialVersionUID
+#define com_libmailcore_NNTPFetchServerTimeOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPFetchServerTimeOperation
- * Method:    date
+ * Method:    time
  * Signature: ()Ljava/util/Date;
  */
-JNIEXPORT jobject JNICALL Java_com_libmailcore_NNTPFetchServerTimeOperation_date
+JNIEXPORT jobject JNICALL Java_com_libmailcore_NNTPFetchServerTimeOperation_time
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
diff --git a/src/java/native/com_libmailcore_NNTPGroupInfo.h b/src/java/native/com_libmailcore_NNTPGroupInfo.h
index 15a08ac8..76c468a9 100644
--- a/src/java/native/com_libmailcore_NNTPGroupInfo.h
+++ b/src/java/native/com_libmailcore_NNTPGroupInfo.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPGroupInfo_serialVersionUID
+#define com_libmailcore_NNTPGroupInfo_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPGroupInfo
  * Method:    setName
diff --git a/src/java/native/com_libmailcore_NNTPListNewsgroupsOperation.h b/src/java/native/com_libmailcore_NNTPListNewsgroupsOperation.h
index ba732f04..6ba1a4ee 100644
--- a/src/java/native/com_libmailcore_NNTPListNewsgroupsOperation.h
+++ b/src/java/native/com_libmailcore_NNTPListNewsgroupsOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPListNewsgroupsOperation_serialVersionUID
+#define com_libmailcore_NNTPListNewsgroupsOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPListNewsgroupsOperation
  * Method:    groups
diff --git a/src/java/native/com_libmailcore_NNTPOperation.h b/src/java/native/com_libmailcore_NNTPOperation.h
index d9d77704..34900bbc 100644
--- a/src/java/native/com_libmailcore_NNTPOperation.h
+++ b/src/java/native/com_libmailcore_NNTPOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPOperation_serialVersionUID
+#define com_libmailcore_NNTPOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPOperation
  * Method:    errorCode
diff --git a/src/java/native/com_libmailcore_NNTPSession.h b/src/java/native/com_libmailcore_NNTPSession.h
index 49b4ba7b..083523ca 100644
--- a/src/java/native/com_libmailcore_NNTPSession.h
+++ b/src/java/native/com_libmailcore_NNTPSession.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NNTPSession_serialVersionUID
+#define com_libmailcore_NNTPSession_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NNTPSession
  * Method:    setHostname
diff --git a/src/java/native/com_libmailcore_NativeObject.cpp b/src/java/native/com_libmailcore_NativeObject.cpp
index 643964ea..afe9a428 100644
--- a/src/java/native/com_libmailcore_NativeObject.cpp
+++ b/src/java/native/com_libmailcore_NativeObject.cpp
@@ -4,6 +4,8 @@
 #include "JavaHandle.h"
 #include "TypesUtils.h"
 
+#define nativeType Object
+
 using namespace mailcore;
 
 JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_initWithNative
@@ -30,7 +32,7 @@ JNIEXPORT jstring JNICALL Java_com_libmailcore_NativeObject_toString
         return (jstring) MC_TO_JAVA(MCSTR("<Uninitialized NativeObject>"));
     }
     else {
-        return (jstring) MC_TO_JAVA(mcObj->description());
+        return MC_JAVA_BRIDGE_GET_STRING(description);
     }
 }
 
@@ -40,14 +42,14 @@ JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_clone
     return MC_TO_JAVA(MC_FROM_JAVA(Object, obj)->copy()->autorelease());
 }
 
-JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_serializable
+JNIEXPORT jbyteArray JNICALL Java_com_libmailcore_NativeObject_serializableData
   (JNIEnv * env, jobject obj)
 {
-    return MC_TO_JAVA(MC_FROM_JAVA(Object, obj)->serializable());
+    return (jbyteArray) MC_TO_JAVA(JSON::objectToJSONData(MC_JAVA_NATIVE_INSTANCE->serializable()));
 }
 
-JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_objectWithSerializable
-  (JNIEnv * env, jclass cls, jobject serializable)
+JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_importSerializableData
+  (JNIEnv * env, jobject obj, jbyteArray data)
 {
-    return MC_TO_JAVA(Object::objectWithSerializable(MC_FROM_JAVA(HashMap, serializable)));
+    MC_JAVA_NATIVE_INSTANCE->importSerializable((HashMap *) JSON::objectFromJSONData(MC_FROM_JAVA(Data, data)));
 }
diff --git a/src/java/native/com_libmailcore_NativeObject.h b/src/java/native/com_libmailcore_NativeObject.h
index ae3c7e38..39b7bd61 100644
--- a/src/java/native/com_libmailcore_NativeObject.h
+++ b/src/java/native/com_libmailcore_NativeObject.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_NativeObject_serialVersionUID
+#define com_libmailcore_NativeObject_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_NativeObject
  * Method:    initWithNative
@@ -41,19 +43,19 @@ JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_clone
 
 /*
  * Class:     com_libmailcore_NativeObject
- * Method:    serializable
- * Signature: ()Ljava/util/Map;
+ * Method:    serializableData
+ * Signature: ()[B
  */
-JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_serializable
+JNIEXPORT jbyteArray JNICALL Java_com_libmailcore_NativeObject_serializableData
   (JNIEnv *, jobject);
 
 /*
  * Class:     com_libmailcore_NativeObject
- * Method:    objectWithSerializable
- * Signature: (Ljava/util/Map;)Lcom/libmailcore/NativeObject;
+ * Method:    importSerializableData
+ * Signature: ([B)V
  */
-JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_objectWithSerializable
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_importSerializableData
+  (JNIEnv *, jobject, jbyteArray);
 
 #ifdef __cplusplus
 }
diff --git a/src/java/native/com_libmailcore_Operation.h b/src/java/native/com_libmailcore_Operation.h
index 6bd26753..6a99c788 100644
--- a/src/java/native/com_libmailcore_Operation.h
+++ b/src/java/native/com_libmailcore_Operation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_Operation_serialVersionUID
+#define com_libmailcore_Operation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_Operation
  * Method:    cancel
diff --git a/src/java/native/com_libmailcore_POPFetchHeaderOperation.h b/src/java/native/com_libmailcore_POPFetchHeaderOperation.h
index 426d7c75..9397c3b0 100644
--- a/src/java/native/com_libmailcore_POPFetchHeaderOperation.h
+++ b/src/java/native/com_libmailcore_POPFetchHeaderOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPFetchHeaderOperation_serialVersionUID
+#define com_libmailcore_POPFetchHeaderOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPFetchHeaderOperation
  * Method:    header
diff --git a/src/java/native/com_libmailcore_POPFetchMessageOperation.h b/src/java/native/com_libmailcore_POPFetchMessageOperation.h
index 73596c12..7ab32f9d 100644
--- a/src/java/native/com_libmailcore_POPFetchMessageOperation.h
+++ b/src/java/native/com_libmailcore_POPFetchMessageOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPFetchMessageOperation_serialVersionUID
+#define com_libmailcore_POPFetchMessageOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPFetchMessageOperation
  * Method:    data
diff --git a/src/java/native/com_libmailcore_POPFetchMessagesOperation.h b/src/java/native/com_libmailcore_POPFetchMessagesOperation.h
index 14dd2c3d..416a645a 100644
--- a/src/java/native/com_libmailcore_POPFetchMessagesOperation.h
+++ b/src/java/native/com_libmailcore_POPFetchMessagesOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPFetchMessagesOperation_serialVersionUID
+#define com_libmailcore_POPFetchMessagesOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPFetchMessagesOperation
  * Method:    messages
diff --git a/src/java/native/com_libmailcore_POPMessageInfo.h b/src/java/native/com_libmailcore_POPMessageInfo.h
index 1aa2648e..8db2bd4d 100644
--- a/src/java/native/com_libmailcore_POPMessageInfo.h
+++ b/src/java/native/com_libmailcore_POPMessageInfo.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPMessageInfo_serialVersionUID
+#define com_libmailcore_POPMessageInfo_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPMessageInfo
  * Method:    setIndex
diff --git a/src/java/native/com_libmailcore_POPOperation.h b/src/java/native/com_libmailcore_POPOperation.h
index f85eba20..713722bd 100644
--- a/src/java/native/com_libmailcore_POPOperation.h
+++ b/src/java/native/com_libmailcore_POPOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPOperation_serialVersionUID
+#define com_libmailcore_POPOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPOperation
  * Method:    errorCode
diff --git a/src/java/native/com_libmailcore_POPSession.h b/src/java/native/com_libmailcore_POPSession.h
index a20adc84..a96f3955 100644
--- a/src/java/native/com_libmailcore_POPSession.h
+++ b/src/java/native/com_libmailcore_POPSession.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_POPSession_serialVersionUID
+#define com_libmailcore_POPSession_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_POPSession
  * Method:    setHostname
diff --git a/src/java/native/com_libmailcore_SMTPOperation.h b/src/java/native/com_libmailcore_SMTPOperation.h
index 4560dd44..71cadb4d 100644
--- a/src/java/native/com_libmailcore_SMTPOperation.h
+++ b/src/java/native/com_libmailcore_SMTPOperation.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_SMTPOperation_serialVersionUID
+#define com_libmailcore_SMTPOperation_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_SMTPOperation
  * Method:    errorCode
diff --git a/src/java/native/com_libmailcore_SMTPSession.h b/src/java/native/com_libmailcore_SMTPSession.h
index bd119365..4008f4f6 100644
--- a/src/java/native/com_libmailcore_SMTPSession.h
+++ b/src/java/native/com_libmailcore_SMTPSession.h
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef com_libmailcore_SMTPSession_serialVersionUID
+#define com_libmailcore_SMTPSession_serialVersionUID 1LL
 /*
  * Class:     com_libmailcore_SMTPSession
  * Method:    setHostname