Update the copyrights, replacing Helix Code with Ximian and

helixcode.com with ximian.com all over the place.

svn path=/trunk/; revision=10440

184 files changed, 325 insertions, 325 deletions

diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
index 4e168efb64..b63103bba6 100644
--- a/camel/broken-date-parser.c
+++ b/camel/broken-date-parser.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ static char *tz_months [] = {
 /*****************************************************************************
  * The following functions are here in the case of badly broken date formats *
  *                                                                           *
- * -- fejj@helixcode.com                                                     *
+ * -- fejj@ximian.com                                                     *
  *****************************************************************************/
 
 typedef struct {
@@ -314,5 +314,5 @@ parse_broken_date (const gchar *datestr)
 /*****************************************************************************
  * This ends the code for the broken date parser...                          *
  *                                                                           *
- * -- fejj@helixcode.com                                                     *
+ * -- fejj@ximian.com                                                     *
  *****************************************************************************/
diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h
index 57607a7bdf..6cb91aa6ea 100644
--- a/camel/broken-date-parser.h
+++ b/camel/broken-date-parser.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/camel-address.c b/camel/camel-address.c
index a1c0990dec..4215cea15e 100644
--- a/camel/camel-address.c
+++ b/camel/camel-address.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-address.h b/camel/camel-address.h
index 5115ee652b..fe133c8825 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 0916cb7dde..236197ef86 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -5,7 +5,7 @@
  *   Michael Zucchi <notzed@ximian.com>
  *   Dan Winship <danw@ximian.com>
  *
- * Copyright 2000, 2001 Ximian, Inc. (http://www.ximian.com)
+ * Copyright 2000, 2001 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index db76281c6f..54d62f8f1e 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index e2d7f10281..dd2f475b1e 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -5,7 +5,7 @@
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index 1b3361f26d..d256c5e842 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -6,7 +6,7 @@
  * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
index 42ef0df339..83389c5588 100644
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.c
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index 2bd1bec90c..5ee23444da 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 83cfb92221..4284af1f8e 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -1,10 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *  Copyright (C) 2001 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index 69e9518e7e..fc72fa1485 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -1,8 +1,8 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
index 78f4ee7b4c..05cc5eddc9 100644
--- a/camel/camel-filter-search.c
+++ b/camel/camel-filter-search.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *	     Michael Zucchi <NotZed@Ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *  Copyright 2001 Ximian Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index 0dba92eb2d..1482f70539 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *	     Michael Zucchi <NotZed@Ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *  Copyright 2001 Ximian Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 18f49868ac..72a2dce139 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2000,2001 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 47f139ce0d..e08540e4d9 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a347774ad5..bd2ff2d8d5 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 6c59915194..6aa8e9525d 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c
index 5187901016..4417668ae1 100644
--- a/camel/camel-folder-thread.c
+++ b/camel/camel-folder-thread.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index d75fc35c54..692991751b 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 736ed2a903..ecf9190a36 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 1baf0206e1..751f730188 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -3,9 +3,9 @@
  * camel-folder.h: Abstract class for an email folder
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
index f9ae9dd37b..5a72916ca9 100644
--- a/camel/camel-internet-address.c
+++ b/camel/camel-internet-address.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index 7afd74fad9..20cdd44a60 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 94063a5484..45509706cb 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -2,7 +2,7 @@
  *
  * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2001 Ximian Inc (http://www.ximian.com/)
+ * Copyright (C) 2001 Ximian Inc (www.ximian.com/)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 3f5bd45f86..1dc970745c 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Author: Michael Zucchi <notzed@helixcode.com>
+ * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
+ * Copyright (C) 1999 Ximian (www.ximian.com/).
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index c14accdd0e..1bb2ebc35b 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Author: Michael Zucchi <notzed@helixcode.com>
+ * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
+ * Copyright (C) 1999 Ximian (www.ximian.com/).
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 37da6ea135..52b51d74ce 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Author: Michael Zucchi <notzed@helixcode.com>
+ * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
+ * Copyright (C) 1999 Ximian (www.ximian.com/).
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index 5baa35e7dc..818df69493 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -3,9 +3,9 @@
 /* camelMedium.c : Abstract class for a medium
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
+ * 	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 40ee17675d..b4254e3be6 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -4,9 +4,9 @@
 /*
  *
  * Authors:  Bertrand Guiheneuf <bertrand@helixcode.com>
- *	     Michael Zucchi <notzed@helixcode.com>
+ *	     Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
index 17e667c5ae..be38933683 100644
--- a/camel/camel-mime-filter-basic.c
+++ b/camel/camel-mime-filter-basic.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index f11b7da479..f466f3a488 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
index 0c42c5c399..eccd5111a8 100644
--- a/camel/camel-mime-filter-bestenc.c
+++ b/camel/camel-mime-filter-bestenc.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index de8caec191..eb18d9e09f 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
index 6c1f668713..34c80c50f9 100644
--- a/camel/camel-mime-filter-charset.c
+++ b/camel/camel-mime-filter-charset.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index f9c78e8896..ce8b967d3b 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
index b6ae095810..58623f2ac7 100644
--- a/camel/camel-mime-filter-crlf.c
+++ b/camel/camel-mime-filter-crlf.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code, Inc.
+ *  Copyright (C) 2000 Ximian, Inc.
  *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Dan Winship <danw@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index 6ba109d154..df5c58b0a5 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Dan Winship <danw@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index 2678294f03..0cd7462e24 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index 730f92f5e4..e271ade3fb 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c
index 06d0ef252b..a24fa7a4bc 100644
--- a/camel/camel-mime-filter-html.c
+++ b/camel/camel-mime-filter-html.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2001 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index 3bac437f63..44495effca 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2001 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
index 46e0f3f5e8..afecb7571a 100644
--- a/camel/camel-mime-filter-index.c
+++ b/camel/camel-mime-filter-index.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index e7733bd4ca..58e1d34b33 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
index ea06566688..95bab894fa 100644
--- a/camel/camel-mime-filter-linewrap.c
+++ b/camel/camel-mime-filter-linewrap.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code, Inc.
+ *  Copyright (C) 2000 Ximian, Inc.
  *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index 189b80d014..b927bd6d40 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
index e1761994ed..3caee1ea95 100644
--- a/camel/camel-mime-filter-save.c
+++ b/camel/camel-mime-filter-save.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
index 1cc05aed14..7398e9fbe7 100644
--- a/camel/camel-mime-filter-save.h
+++ b/camel/camel-mime-filter-save.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
index aac01bb79c..2887cbbd1e 100644
--- a/camel/camel-mime-filter.c
+++ b/camel/camel-mime-filter.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index dd30b0449c..7b1c73b2b0 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 1977c3419b..6e3d4b7cad 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -3,10 +3,10 @@
 
 /* 
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *          Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 47c390a5a5..4f154aee1f 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -2,9 +2,9 @@
 /* camelMimeMessage.h : class for a mime message
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 77c39ddde9..c45b93fb38 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index cef51696df..0f637e3a90 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index ad9c54f663..95c574790e 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -2,9 +2,9 @@
 /* camel-mime-part-utils : Utility for mime parsing and so on
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
+ * 	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 1e1c3655aa..a5b21dab53 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -7,7 +7,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index b582f8a780..733d08c719 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 4d844af3fd..bf302f507f 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -4,9 +4,9 @@
 /* 
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 5f66c08ab4..db8558cb18 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -1,8 +1,8 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 2739e5e0f9..08755c47b1 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -1,8 +1,8 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index c71000f9b5..bd00075485 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -3,9 +3,9 @@
 
 /*
  * Author:
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index ea75c82603..e66acdde18 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -3,9 +3,9 @@
 
 /* 
  * Author: 
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 79a0c24208..e997e054d1 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -10,7 +10,7 @@
  * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index 3058b8f2e0..7272d0bb74 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -6,7 +6,7 @@
  * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c
index ebd35b80c7..ba8752f514 100644
--- a/camel/camel-news-address.c
+++ b/camel/camel-news-address.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors:
  *
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
index b1c7856675..b0aad4ac96 100644
--- a/camel/camel-news-address.h
+++ b/camel/camel-news-address.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: 
  *
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 7f53a68bfe..a7c0e1b2f0 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -3,9 +3,9 @@
 
 /*
  * Author:
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-object.h b/camel/camel-object.h
index ad76b0add9..f59ae5788d 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -3,9 +3,9 @@
 
 /*
  * Author:
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index 8bf5cfa2dc..9dab0b0377 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -2,7 +2,7 @@
  *
  * Authors: Michael Zucchi <NotZed@Ximian.com>
  *
- * Copyright 2001 Ximian, Inc. (http://www.ximian.com/)
+ * Copyright 2001 Ximian, Inc. (www.ximian.com/)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-private.h b/camel/camel-private.h
index 0a84d99a55..fa9b50a8a0 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *  camel-private.h: Private info for class implementers.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index ba1dfd5b48..3461a530d0 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -5,10 +5,10 @@
  *
  * Authors:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
+ *  Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index e8bad9618d..5301a42ec6 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -5,9 +5,9 @@
  *
  * Authors:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
+ *  Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
index 767a0fbe51..65445189fd 100644
--- a/camel/camel-remote-store.c
+++ b/camel/camel-remote-store.c
@@ -2,10 +2,10 @@
 /* camel-remote-store.c : class for an remote store */
 
 /*
- *  Authors: Peter Williams <peterw@helixcode.com>
+ *  Authors: Peter Williams <peterw@ximian.com>
  *           based on camel-imap-provider.c
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
index ab22c0e86b..2419692e98 100644
--- a/camel/camel-remote-store.h
+++ b/camel/camel-remote-store.h
@@ -2,9 +2,9 @@
 /* camel-remote-store.h : class for a remote store */
 
 /* 
- * Authors: Peter Williams <peterw@helixcode.com>
+ * Authors: Peter Williams <peterw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 65f6c17ff9..164f4d2b60 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *	     Michael Zucchi <NotZed@Ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *  Copyright 2001 Ximian Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index aff881f32f..78e0eb192e 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2001 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 45a6a6edf4..e9fe14902d 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -4,7 +4,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 3c0eb24a5c..6fcb5c05c5 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index d2990b6b80..a04a97fe83 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -2,9 +2,9 @@
 /* camel-stream-fs.c : file system based stream
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 6ac5588a42..0b275b4ca2 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 7c31bde274..a6fc807205 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -6,7 +6,7 @@
  * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-service.h b/camel/camel-service.h
index 64574123d5..41ac53c4c7 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-session.h b/camel/camel-session.h
index ba4a06490c..fa0705c693 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -6,7 +6,7 @@
  * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 3418bd9a56..78f561d3b9 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -4,9 +4,9 @@
 /* 
  * Authors:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-store.h b/camel/camel-store.h
index d81f08e914..d46786674a 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -5,7 +5,7 @@
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index f0857d49e4..4d9a4de600 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -2,9 +2,9 @@
 
 /* camel-stream-buffer.c : Buffer any other other stream
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 81ab1a072e..c2a3841cce 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -4,9 +4,9 @@
 /*
  *
  * Author :
- *  Michael Zucchi <notzed@helixcode.com>
+ *  Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 2000 Helix Code Inc. (http://www.helixcode.com) .
+ * Copyright 2000 Ximian Inc. (www.ximian.com) .
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index 3956f24346..47817e2b16 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index b3906eef31..c48356ad07 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 7ecafd88ff..f7c5900325 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -3,9 +3,9 @@
 
 /*
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 4393b0e3eb..cc7a337a22 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index afaeca9b0e..7389045567 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -3,9 +3,9 @@
 
 /*
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 5ac13750f4..fb95c4bd25 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -3,9 +3,9 @@
 
 /*
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
+ *	    Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 293dd36736..8e9e107f0f 100644
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.c
@@ -3,9 +3,9 @@
 
 /*
  * Author:
- *  Michael Zucchi <notzed@helixcode.com>
+ *  Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index e12effdcad..db702b9ae2 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public License
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index a883905e8d..80391843f0 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index 6a2517b0bb..0927bff85f 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -5,7 +5,7 @@
  * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 5219ac4288..5d902ddd33 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -4,9 +4,9 @@
 /* 
  *
  * Author : 
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index aeab3ba489..ae6ca50f40 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -4,9 +4,9 @@
 /* 
  *
  * Author : 
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-types.h b/camel/camel-types.h
index 4a146b5668..f2928bb9f8 100644
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
 /* 
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index fcea86f608..83305c1fd3 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors:
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index 57a75ab16a..98838b30c6 100644
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.h
@@ -5,7 +5,7 @@
  * Authors:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-url.c b/camel/camel-url.c
index aa4c0e2c4f..f3b5766b25 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -7,7 +7,7 @@
  *  Tiago Antào <tiagoantao@bigfoot.com>
  *  Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999-2001 Ximian, Inc. (http://www.ximian.com)
+ * Copyright 1999-2001 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-url.h b/camel/camel-url.h
index 9465da06a1..535f24869e 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -4,9 +4,9 @@
 /* 
  * Authors:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index bc20ef3d59..83a4bb4893 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1,8 +1,8 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index 650a53ec14..8c7deb6e41 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index 5a9d79d8b2..2d44b456d5 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index c6249a05dc..d325565499 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel.c b/camel/camel.c
index 4a31b9e648..aaf31ca775 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -5,7 +5,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/camel.h b/camel/camel.h
index 1b10199344..2226a571cb 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -5,7 +5,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/gstring-util.c b/camel/gstring-util.c
index 82dde51236..40ffc91e19 100644
--- a/camel/gstring-util.c
+++ b/camel/gstring-util.c
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/gstring-util.h b/camel/gstring-util.h
index 487bbc8a3b..3a56efde07 100644
--- a/camel/gstring-util.h
+++ b/camel/gstring-util.h
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c
index ca4323d638..8354b0a633 100644
--- a/camel/hash-table-utils.c
+++ b/camel/hash-table-utils.c
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h
index 79c4cef72d..05247e370f 100644
--- a/camel/hash-table-utils.h
+++ b/camel/hash-table-utils.h
@@ -6,7 +6,7 @@
  * Author : 
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 6004840f88..95014eca40 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *  camel-imap-private.h: Private info for imap.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index 19e72dba5a..c4b86c3bfc 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -2,9 +2,9 @@
 /* camel-imap-provider.c: imap provider registration code */
 
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index 97fd6cd6c4..58bd2268ba 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -3,9 +3,9 @@
 
 /*
  *  Authors:
- *    Dan Winship <danw@helixcode.com>
+ *    Dan Winship <danw@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 8c0453cb53..accbc8b9ae 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -2,9 +2,9 @@
 /* camel-imap-store.h : class for an imap store */
 
 /* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ * Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index e662f013c9..7e737fdd8d 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -1,10 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
+ *    Michael Zucchi <notzed@ximian.com>
+ *    Dan Winship <danw@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index e507e75a23..1b96008b1f 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -1,9 +1,9 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
+ *    Michael Zucchi <notzed@ximian.com>
+ *    Dan Winship <danw@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
index e5d2d18dc1..162841e75f 100644
--- a/camel/providers/imap/camel-imap-types.h
+++ b/camel/providers/imap/camel-imap-types.h
@@ -2,7 +2,7 @@
 /* camel-imap-types.h: IMAP types */
 
 /* 
- * Copyright (C) 2001 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 3f581b0c17..1da6bbcf20 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
index 583505a95c..a3b4bbdfdc 100644
--- a/camel/providers/imap/camel-imap-utils.h
+++ b/camel/providers/imap/camel-imap-utils.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index 20ad0c730a..70c68002a0 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -2,9 +2,9 @@
 /* camel-imap-wrapper.c: data wrapper for offline IMAP data */
 
 /*
- * Author: Dan Winship <danw@helixcode.com>
+ * Author: Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index 38bfd62fe2..0f9bc0d529 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -2,7 +2,7 @@
 /* camel-imap-wrapper.h: data wrapper for offline IMAP data */
 
 /*
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 1293ca60cc..811a71ecbe 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  * 
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999, 2000 Helix Code Inc.
+ * Copyright (C) 1999, 2000 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index 7c975c8f7a..227bada2c9 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Author: Michael Zucchi <notzed@helixcode.com>
+ * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code (http://www.helixcode.com/).
+ * Copyright (C) 1999 Ximian (www.ximian.com/).
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index 5008f7bb23..6c9b156752 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *  camel-local-private.h: Private info for local provider.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index 078945a764..2cfade5464 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  * 
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2000 HelixCode (www.helixcode.com).
+ * Copyright (C) 2000 Ximian (www.ximian.com).
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 4b948ab96a..fe8f09a911 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 9335b73eaa..75fe6bba98 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -3,7 +3,7 @@
 
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <bertrand@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <bertrand@helixcode.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 8f785afe15..25cdf0d045 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 332175b451..ff71e76867 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index a60b315e0e..159aa84620 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999, 2000 Helix Code Inc.
+ * Copyright (C) 1999, 2000 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 5076e2f73c..f145d5ef18 100644
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Authors:
- * 	Michael Zucchi <notzed@helixcode.com>
+ * 	Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code Inc.
+ * Copyright (C) 1999 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index b85bdc3aeb..4cc8be1ba0 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 27b6a6e590..0443c2b57d 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 5d65b02a5e..ee9411c297 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index a42692671c..fbb266dfb0 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 5d0d816d27..1bab553ecf 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999, 2000 Helix Code Inc.
+ * Copyright (C) 1999, 2000 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index 688135ff76..016cdaea8f 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code .
+ * Copyright (C) 1999 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 712c7fde37..adf6806510 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index bc8d5149f5..5387413954 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 3f0dd100dd..0b502aeecb 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  *
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index e24c2b4cdd..628aa7d695 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *  Authors: Michael Zucchi <notzed@ximian.com>
  *
  *  This program is free software; you can redistribute it and/or 
  *  modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 88ef69c2b5..cf9bc827bf 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999, 2000 Helix Code Inc.
+ * Copyright (C) 1999, 2000 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 175aef2946..270bdeb04d 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Authors:
- * 	Michael Zucchi <notzed@helixcode.com>
+ * 	Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 1999 Helix Code Inc.
+ * Copyright (C) 1999 Ximian Inc.
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index 3edadb5ca1..23515a8a61 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index f1f8eb9983..074e8ffbf1 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
- * Authors: Michael Zucchi <notzed@helixcode.com>
+ * Authors: Michael Zucchi <notzed@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 3e588be909..f2ba0c9393 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 52cc496610..2c2b8f613d 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index acbdb8d1e7..be4ca31cf2 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -2,7 +2,7 @@
  * 
  * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2001 Ximian Inc (http://www.ximian.com/)
+ * Copyright (C) 2001 Ximian Inc (www.ximian.com/)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 2b09802678..1a342dc1dc 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -2,7 +2,7 @@
  *
  * Author: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2001 Ximian Inc (http://www.ximian.com/)
+ * Copyright (C) 2001 Ximian Inc (www.ximian.com/)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index 655050c5f4..7389d1d045 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -2,7 +2,7 @@
  *
  * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2001 Ximian Inc (http://www.ximian.com/)
+ * Copyright (C) 2001 Ximian Inc (www.ximian.com/)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index d348421e3c..a659c16ca5 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -2,7 +2,7 @@
  *
  * Authors: Michael Zucchi <notzed@ximian.com>
  *
- * Copyright (C) 2001 Ximian Inc (http://www.ximian.com)
+ * Copyright (C) 2001 Ximian Inc (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 5d508f643a..6a44fdf7cb 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
  *
- *  Copyright (C) 2001 Ximian Inc. (http://www.ximian.com)
+ *  Copyright (C) 2001 Ximian Inc. (www.ximian.com)
  *
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index 8cf9daf710..02b471c632 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2001 Ximian Inc. (http://www.ximian.com)
+ *  Copyright (C) 2001 Ximian Inc. (www.ximian.com)
  *
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index b211f52593..d11ca83860 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -3,7 +3,7 @@
 
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 2708d9d335..dbcbc898db 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -3,9 +3,9 @@
 
 /* 
  *
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 1999 Helix Code .
+ * Copyright (C) 1999 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 7edc4a98fd..4d27771c2c 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -2,9 +2,9 @@
 /* camel-nntp-folder.c : Abstract class for an email folder */
 
 /* 
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 190d0bf346..e81ab00a98 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -3,9 +3,9 @@
 
 /* 
  *
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index 578a6eba66..8969f651b3 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -2,9 +2,9 @@
 /* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */
 
 /* 
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 67c74d5dc2..3b3451773e 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -2,9 +2,9 @@
 /* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
 
 /* 
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index d0b56222cf..b1bc865068 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -2,7 +2,7 @@
 /* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 07857c173c..cb08912b83 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors :
- *   Chris Toshok <toshok@helixcode.com>
+ *   Chris Toshok <toshok@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 8b9dc8ff6c..27d450b261 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -3,7 +3,7 @@
 
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 494e11f647..e4e115cea4 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -3,7 +3,7 @@
 
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index d7836f47ae..225180dbcc 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -3,7 +3,7 @@
 
 /* 
  *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
+ * Copyright (C) 2000 Ximian, Inc. <toshok@ximian.com>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index b1d91779b1..49aa9987e0 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -2,9 +2,9 @@
 /* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
 
 /* 
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 439626d977..3bff5bfb58 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -2,9 +2,9 @@
 /* camel-nntp-utils.c : utilities used by the nntp code. */
 
 /* 
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 2000 Helix Code .
+ * Copyright (C) 2000 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index f28697c744..f40c75cd91 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -3,9 +3,9 @@
 
 /* 
  *
- * Author : Chris Toshok <toshok@helixcode.com> 
+ * Author : Chris Toshok <toshok@ximian.com> 
  *
- * Copyright (C) 1999 Helix Code .
+ * Copyright (C) 1999 Ximian .
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 4d5c066491..b33a9f1569 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors:
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 278cd0e8e9..ef3f6d94c2 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -3,9 +3,9 @@
 
 /* 
  * Author:
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 0931f903ed..6d324f6d64 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors :
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 67b661caf4..5c94c13fce 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors:
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 078a317a14..38e6214c3b 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -3,9 +3,9 @@
 
 /* 
  * Authors:
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 2e9168f772..d61351867c 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -3,9 +3,9 @@
 
 /* 
  * Authors :
- *   Dan Winship <danw@helixcode.com>
+ *   Dan Winship <danw@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 9cd0c1efa1..c65b8784c7 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -3,9 +3,9 @@
 
 /* 
  *
- * Authors: Dan Winship <danw@helixcode.com>
+ * Authors: Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index bb5dca071b..1f05e7c6cc 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -4,9 +4,9 @@
 /* 
  *
  * Author : 
- *  Dan Winship <danw@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
  *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 3bb47b3429..299cdc1ccb 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -5,7 +5,7 @@
  * Authors :
  *   Jeffrey Stedfast <fejj@stampede.org>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 9cd5d4ba6a..30bb9d5c80 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -2,9 +2,9 @@
 /* camel-smtp-transport.c : class for a smtp transport */
 
 /* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ * Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index 4515fe1f07..0b72a5ef25 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -5,7 +5,7 @@
  * Authors:
  *   Jeffrey Stedfast <fejj@stampede.org>
  *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
+ * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/string-utils.c b/camel/string-utils.c
index 584e2dad0d..22ec3d2c90 100644
--- a/camel/string-utils.c
+++ b/camel/string-utils.c
@@ -4,9 +4,9 @@
 /* 
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
+ *          Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/camel/string-utils.h b/camel/string-utils.h
index e20c2e6a77..c452d75759 100644
--- a/camel/string-utils.h
+++ b/camel/string-utils.h
@@ -4,9 +4,9 @@
 /* 
  *
  * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
+ *          Jeffrey Stedfast <fejj@ximian.com>
  *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as