diff --git a/.gitattributes b/.gitattributes
index a92794403205b6a0730cbebee2806f285556500b..7bd20ae126e9887c5158a0a8d284cb42cb17cc03 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,10 @@
 [attr]binary -text -crlf -diff -ident
 * text ident
+
+# Handling of foreign (ie CVS) identifiers.
+#
+[attr]foreign_ident -ident block_commit=Remove-foreign_ident-attribute-before-commit.
+# Files containing CVS ids follow.
+# Remove the corresponding line before committing
+# changes to these files.
+/lib/modules/Protocols.pmod/IMAP.pmod/imap_server.pike foreign_ident
diff --git a/lib/modules/Protocols.pmod/IMAP.pmod/imap_server.pike b/lib/modules/Protocols.pmod/IMAP.pmod/imap_server.pike
index e09138216b59e91b54ff3e174fb6ed377c34a2e9..a9299bfdec8c4eac779a545b88d4b92a6ffb1c0c 100644
--- a/lib/modules/Protocols.pmod/IMAP.pmod/imap_server.pike
+++ b/lib/modules/Protocols.pmod/IMAP.pmod/imap_server.pike
@@ -1,5 +1,6 @@
 /* imap_server.pike
  *
+ * $Id: imap_server.pike,v 1.9 1999/01/28 18:42:42 grubba Exp $
  */
 
 mapping unauth_commands =
@@ -45,8 +46,8 @@ mapping select_commands =
 //    "check" : .requests.check,
 //    "close" : .requests.close,
 //    "expunge" : .requests.expunge,
-//    "search" : .requests.search,
-//    "fetch" : .requests.fetch,
+   "search" : .requests.search,
+   "fetch" : .requests.fetch,
 //    "store" : .requests.store,
 //    "copy" : .requests.copy,
 //    "uid" : .requests.uid