diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
index 1c27a291..6f81b7a9 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
@@ -30,6 +30,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.ParcelFileDescriptor;
@@ -48,8 +49,8 @@ import java.lang.ref.WeakReference;
 public class MitmAddon {
     /* API */
     public static final String PACKAGE_NAME = "com.pcapdroid.mitm";
-    public static final String PACKAGE_VERSION_NAME = "v0.4";
-    public static final int PACKAGE_VERSION_CODE = 4;
+    public static final String PACKAGE_VERSION_NAME = "v0.5";
+    public static final long PACKAGE_VERSION_CODE = 5;
     public static final String MITM_PERMISSION = "com.pcapdroid.permission.MITM";
     public static final String MITM_SERVICE = PACKAGE_NAME + ".MitmService";
 
@@ -72,7 +73,7 @@ public class MitmAddon {
         // Important: the application context is required here, otherwise bind/unbind will not work properly
         mContext = ctx.getApplicationContext();
         mReceiver = receiver;
-        mMessenger = new Messenger(new ReplyHandler(receiver));
+        mMessenger = new Messenger(new ReplyHandler(ctx.getMainLooper(), receiver));
     }
 
     private final ServiceConnection mConnection = new ServiceConnection() {
@@ -89,10 +90,10 @@ public class MitmAddon {
         }
     };
 
-    public static int getInstalledVersion(Context ctx) {
+    public static long getInstalledVersion(Context ctx) {
         try {
             PackageInfo pInfo = ctx.getPackageManager().getPackageInfo(PACKAGE_NAME, 0);
-            return pInfo.versionCode;
+            return pInfo.getLongVersionCode();
         } catch (PackageManager.NameNotFoundException e) {
             return -1;
         }
@@ -139,7 +140,8 @@ public class MitmAddon {
     private static class ReplyHandler extends Handler {
         private final WeakReference<MitmListener> mReceiver;
 
-        ReplyHandler(MitmListener receiver) {
+        ReplyHandler(Looper looper, MitmListener receiver) {
+            super(looper);
             mReceiver = new WeakReference<>(receiver);
         }
 
diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
index f4fc798e..4267f9d5 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
@@ -151,31 +151,41 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener
                 String payload_type;
                 int port;
                 int payload_len;
+                long tstamp;
 
                 // Read the header
+                @SuppressWarnings("deprecation")
                 String header = istream.readLine();
-                if(header == null)
+
+                if(header == null) {
+                    CaptureService.requireInstance().reportError("[BUG] Empty header received from the mitm plugin");
+                    CaptureService.stopService();
                     break;
+                }
 
                 StringTokenizer tk = new StringTokenizer(header);
                 //Log.d(TAG, "[HEADER] " + header);
 
                 try {
-                    // port:payload_type:payload_length\n
-                    String tk_port = tk.nextToken(":");
+                    // timestamp:port:payload_type:payload_length\n
+                    String tk_tstamp = tk.nextToken(":");
+                    String tk_port = tk.nextToken();
                     payload_type = tk.nextToken();
                     String tk_len = tk.nextToken();
 
+                    tstamp = Long.parseLong(tk_tstamp);
                     port = Integer.parseInt(tk_port);
                     payload_len = Integer.parseInt(tk_len);
                 } catch (NoSuchElementException | NumberFormatException e) {
-                    Log.w(TAG, "Invalid header");
-                    return;
+                    CaptureService.requireInstance().reportError("[BUG] Invalid header received from the mitm plugin");
+                    CaptureService.stopService();
+                    break;
                 }
 
-                if((payload_len <= 0) || (payload_len > 8388608)) { /* max 8 MB */
-                    Log.w(TAG, "Bad payload length: " + payload_len);
-                    return;
+                if((payload_len <= 0) || (payload_len > 67108864)) { /* max 64 MB */
+                    Log.w(TAG, "Ignoring bad payload length: " + payload_len);
+                    istream.skipBytes(payload_len);
+                    continue;
                 }
 
                 PayloadType pType = parsePayloadType(payload_type);
@@ -184,15 +194,14 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener
                 byte[] payload = new byte[payload_len];
                 istream.readFully(payload);
 
-                long now = System.currentTimeMillis();
                 ConnectionDescriptor conn = getConnByLocalPort(port);
                 //Log.d(TAG, "PAYLOAD." + pType.name() + "[" + payload_len + " B]: port=" + port + ", match=" + (conn != null));
 
                 if(conn != null)
-                    handlePayload(conn, pType, payload, now);
+                    handlePayload(conn, pType, payload, tstamp);
                 else
                     // We may receive a payload before seeing the connection in connectionsAdded
-                    addPendingPayload(new PendingPayload(pType, payload, port, now));
+                    addPendingPayload(new PendingPayload(pType, payload, port, tstamp));
             }
         } catch (IOException e) {
             if(mSocketFd != null) // ignore termination
@@ -226,7 +235,7 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener
         }
     }
 
-    private void handlePayload(ConnectionDescriptor conn, PayloadType pType, byte[] payload, long now) {
+    private void handlePayload(ConnectionDescriptor conn, PayloadType pType, byte[] payload, long tstamp) {
         // NOTE: we are possibly accessing the conn concurrently
         if(pType == PayloadType.TLS_ERROR) {
             conn.tls_error = new String(payload, StandardCharsets.US_ASCII);
@@ -235,7 +244,7 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener
             if(conn.status == ConnectionDescriptor.CONN_STATUS_CLOSED)
                 conn.status = ConnectionDescriptor.CONN_STATUS_CLIENT_ERROR;
         } else
-            conn.addPayloadChunk(new PayloadChunk(payload, getChunkType(pType), isSent(pType), now));
+            conn.addPayloadChunk(new PayloadChunk(payload, getChunkType(pType), isSent(pType), tstamp));
     }
 
     private synchronized void addPendingPayload(PendingPayload pending) {
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java
index b164515c..45007561 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java
@@ -56,7 +56,7 @@ public class InstallAddon extends StepFragment {
     }
 
     private void installAddon() {
-        int installed_ver = MitmAddon.getInstalledVersion(requireContext());
+        long installed_ver = MitmAddon.getInstalledVersion(requireContext());
 
         if(installed_ver < 0) {
             mStepLabel.setText(R.string.install_mitm_addon);