diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs
index 0c1ad3b..7cf31d7 100644
--- a/src/proto/server/response.rs
+++ b/src/proto/server/response.rs
@@ -106,6 +106,10 @@ impl ProtoEncode for ServerResponse {
                 encoder.encode_u32(CODE_CONNECT_TO_PEER)?;
                 response.encode(encoder)?;
             },
+            ServerResponse::FileSearchResponse(ref response) => {
+                encoder.encode_u32(CODE_FILE_SEARCH)?;
+                response.encode(encoder)?;
+            },
             _ => {
                 unimplemented!();
             },
@@ -122,6 +126,10 @@ impl ProtoDecode for ServerResponse {
                 let response = ConnectToPeerResponse::decode(decoder)?;
                 ServerResponse::ConnectToPeerResponse(response)
             },
+            CODE_FILE_SEARCH => {
+                let response = FileSearchResponse::decode(decoder)?;
+                ServerResponse::FileSearchResponse(response)
+            },
             _ => {
                 return Err(DecodeError::UnknownCodeError(code));
             },
@@ -199,7 +207,7 @@ impl ProtoDecode for ConnectToPeerResponse {
  * FILE SEARCH *
  *=============*/
 
-#[derive(Debug)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct FileSearchResponse {
     pub user_name: String,
     pub ticket: u32,
@@ -220,6 +228,28 @@ impl ReadFromPacket for FileSearchResponse {
     }
 }
 
+impl ProtoEncode for FileSearchResponse {
+    fn encode(&self, encoder: &mut ProtoEncoder) -> Result<(), io::Error> {
+        encoder.encode_string(&self.user_name)?;
+        encoder.encode_u32(self.ticket)?;
+        encoder.encode_string(&self.query)
+    }
+}
+
+impl ProtoDecode for FileSearchResponse {
+    fn decode(decoder: &mut ProtoDecoder) -> Result<Self, DecodeError> {
+        let user_name = decoder.decode_string()?;
+        let ticket = decoder.decode_u32()?;
+        let query = decoder.decode_string()?;
+
+        Ok(FileSearchResponse {
+            user_name: user_name,
+            ticket: ticket,
+            query: query,
+        })
+    }
+}
+
 /*=======*
  * LOGIN *
  *=======*/
@@ -721,4 +751,13 @@ mod tests {
             is_privileged: true,
         })
     }
+
+    #[test]
+    fn roundtrip_file_search() {
+        roundtrip(FileSearchResponse {
+            user_name: "alice".to_string(),
+            ticket: 1337,
+            query: "foo.txt".to_string(),
+        })
+    }
 }