Index: api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
===================================================================
--- api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java	(revision 1416871)
+++ api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java	(working copy)
@@ -19,6 +19,7 @@
 
 package org.apache.james.mailbox.model;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,7 @@
  * provided for criteria.
  * </p>
  */
-public class SearchQuery {
+public class SearchQuery implements Serializable {
 
     /**
      * The Resolution which should get used for {@link Date} searches
@@ -72,7 +73,7 @@
      * 
      *
      */
-    public static final class Sort {
+    public static final class Sort implements Serializable {
         
         /**
          * Specify on what to sort
@@ -702,7 +703,7 @@
      * boundaries. May be a single value. {@link Long#MAX_VALUE} represents
      * unlimited in either direction.
      */
-    public static final class NumericRange {
+    public static final class NumericRange implements Serializable {
         private final long lowValue;
 
         private final long highValue;
@@ -787,7 +788,7 @@
     /**
      * Marker superclass for criteria.
      */
-    public static abstract class Criterion {
+    public static abstract class Criterion implements Serializable {
     }
 
     public enum Conjunction {
@@ -1534,7 +1535,7 @@
     /**
      * Search operator.
      */
-    public interface Operator {
+    public interface Operator extends Serializable {
     }
 
     /**