Update the copyrights, replacing Helix Code with Ximian and

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

svn path=/trunk/; revision=10440

37 files changed, 80 insertions, 80 deletions

diff --git a/mail/Mail.idl b/mail/Mail.idl
index 429ed118ab..d864c59c8c 100644
--- a/mail/Mail.idl
+++ b/mail/Mail.idl
@@ -2,9 +2,9 @@
  * mail.idl: Mail interfaces for Evolution
  *
  * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
+ *   Miguel de Icaza (miguel@ximian.com)
  * 
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #include <Bonobo.idl>
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 14a9c7d823..9c375786b7 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* component-factory.c
  *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
+ * Authors: Ettore Perazzoli <ettore@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/mail/component-factory.h b/mail/component-factory.h
index 1f5a33f407..5e583109ea 100644
--- a/mail/component-factory.h
+++ b/mail/component-factory.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* component-factory.h
  *
- * 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/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 38602b5a64..68e783e665 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -3,9 +3,9 @@
  * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers
  *
  * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
+ *   Miguel de Icaza (miguel@ximian.com)
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h
index ec49e0524d..a279e6abd0 100644
--- a/mail/folder-browser-factory.h
+++ b/mail/folder-browser-factory.h
@@ -3,9 +3,9 @@
  * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers
  *
  * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
+ *   Miguel de Icaza (miguel@ximian.com)
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #ifndef _FOLDER_BROWSER_FACTORY_H
diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h
index 265f86d321..34d36294a8 100644
--- a/mail/mail-account-editor.h
+++ b/mail/mail-account-editor.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 080eaf3d7a..691cd5e0ef 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
index be7898ad8c..62b73ec6f0 100644
--- a/mail/mail-accounts.h
+++ b/mail/mail-accounts.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 63dfb4e643..93bb30b595 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* mail-autofilter.c
  *
- * 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
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors:
- *   Michael Zucchi <notzed@helixcode.com>
- *   Ettore Perazzoli <ettore@helixcode.com>
+ *   Michael Zucchi <notzed@ximian.com>
+ *   Ettore Perazzoli <ettore@ximian.com>
  */
 
 /* Code for autogenerating rules or filters from a message.  */
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index ee2d00414a..588e5c5f3a 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* mail-autofilter.h
  *
- * 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
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors:
- *   Michael Zucchi <notzed@helixcode.com>
- *   Ettore Perazzoli <ettore@helixcode.com>
+ *   Michael Zucchi <notzed@ximian.com>
+ *   Ettore Perazzoli <ettore@ximian.com>
  */
 
 #ifndef _MAIL_AUTOFILTER_H
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index f685368e4d..730df51c5e 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -3,11 +3,11 @@
 
 /* 
  * Authors: 
- *  Dan Winship <danw@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
+ *  Peter Williams <peterw@ximian.com>
+ *  Jeffrey Stedfast <fejj@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/mail/mail-callbacks.h b/mail/mail-callbacks.h
index 5f1e4228db..836401e520 100644
--- a/mail/mail-callbacks.h
+++ b/mail/mail-callbacks.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/mail/mail-config-druid.h b/mail/mail-config-druid.h
index 8192cd8ec4..0108fe1223 100644
--- a/mail/mail-config-druid.h
+++ b/mail/mail-config-druid.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 4f6ad68ed0..dadf4e3123 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-config.h b/mail/mail-config.h
index e71b0878b7..a068e9f4ac 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.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 2001 Helix Code, Inc. (www.helixcode.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 published by
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index a4eaba42b0..4b77cc0f72 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.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/mail/mail-display.c b/mail/mail-display.c
index 2596009017..81f00b9d82 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -6,7 +6,7 @@
  *   Miguel de Icaza
  *   Bertrand Guiheneuf (bg@aful.org)
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
index d99c42894c..891209186a 100644
--- a/mail/mail-identify.c
+++ b/mail/mail-identify.c
@@ -2,9 +2,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 published by
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 570fc9847b..49e7d67d38 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -3,12 +3,12 @@
 
 /* 
  * Authors: 
- *  Michael Zucchi <NotZed@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Ettore Perazzoli <ettore@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
+ *  Michael Zucchi <NotZed@ximian.com>
+ *  Peter Williams <peterw@ximian.com>
+ *  Ettore Perazzoli <ettore@ximian.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/mail/mail-local.h b/mail/mail-local.h
index 254fcbe4f6..54950a38b3 100644
--- a/mail/mail-local.h
+++ b/mail/mail-local.h
@@ -3,10 +3,10 @@
 
 /* 
  * Authors: 
- *  Michael Zucchi <NotZed@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
+ *  Michael Zucchi <NotZed@ximian.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/mail/mail-mt.h b/mail/mail-mt.h
index ac199af239..8619642a07 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.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 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 published by
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index acf5bbbd1b..6804e835c1 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2,12 +2,12 @@
 /* mail-ops.c: callbacks for the mail toolbar/menus */
 
 /* 
- * Authors: Dan Winship <danw@helixcode.com>
- *  	    Jeffrey Stedfast <fejj@helixcode.com>
- *          Peter Williams <peterw@helixcode.com>
+ * Authors: Dan Winship <danw@ximian.com>
+ *  	    Jeffrey Stedfast <fejj@ximian.com>
+ *          Peter Williams <peterw@ximian.com>
  *          Michael Zucchi <notzed@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/mail/mail-ops.h b/mail/mail-ops.h
index 078b684448..cf8cc892ff 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -2,10 +2,10 @@
 
 /* 
  * Authors: 
- *  Peter Williams <peterw@helixcode.com>
+ *  Peter Williams <peterw@ximian.com>
  *  Michael Zucchi <notzed@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/mail/mail-search-dialogue.h b/mail/mail-search-dialogue.h
index 3c50d249e1..9e87928e10 100644
--- a/mail/mail-search-dialogue.h
+++ b/mail/mail-search-dialogue.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/mail/mail-session.h b/mail/mail-session.h
index bd2b5b290b..fa622be731 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.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/mail/mail-summary.c b/mail/mail-summary.c
index a10d57aea7..0b8e64a592 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* mail-summary.c
  *
- * Authors: Iain Holmes <iain@helixcode.com>
+ * Authors: Iain Holmes <iain@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/mail/mail-summary.h b/mail/mail-summary.h
index 8c706a1787..d9f098303f 100644
--- a/mail/mail-summary.h
+++ b/mail/mail-summary.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* mail-summary.h
  *
- * Authors: Iain Holmes <iain@helixcode.com>
+ * Authors: Iain Holmes <iain@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/mail/mail-tools.c b/mail/mail-tools.c
index 18b1a0f742..7a1a9e7607 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -3,11 +3,11 @@
 
 /* 
  * Authors: 
- *  Dan Winship <danw@helixcode.com>
- *  Peter Williams <peterw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
+ *  Dan Winship <danw@ximian.com>
+ *  Peter Williams <peterw@ximian.com>
+ *  Jeffrey Stedfast <fejj@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/mail/mail-tools.h b/mail/mail-tools.h
index 5cb546a250..6f0c1de765 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -2,9 +2,9 @@
 
 /* 
  * Author : 
- *  Peter Williams <peterw@helixcode.com>
+ *  Peter Williams <peterw@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/mail/mail-types.h b/mail/mail-types.h
index 3a71f2c8a2..6bcd77df5b 100644
--- a/mail/mail-types.h
+++ b/mail/mail-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/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 39753a5cf1..ef401017f1 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1,7 +1,7 @@
 /*
-  Copyright 2000, 2001 Helix Code Inc.
+  Copyright 2000, 2001 Ximian Inc.
 
-  Author: Michael Zucchi <notzed@helixcode.com>
+  Author: Michael Zucchi <notzed@ximian.com>
 
   code for managing vfolders
 
diff --git a/mail/mail.h b/mail/mail.h
index 98b437b4ca..50fdafc534 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -1,6 +1,6 @@
 /* -*- 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 published by
diff --git a/mail/main.c b/mail/main.c
index 4a811277c0..0656b44555 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -2,9 +2,9 @@
  * main.c: The core of the mail component
  *
  * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
+ *   Miguel de Icaza (miguel@ximian.com)
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mail/message-list.c b/mail/message-list.c
index 64729048f1..ca893b9606 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4,11 +4,11 @@
  *                 Implements CORBA's Evolution::MessageList
  *
  * Author:
- *     Miguel de Icaza (miguel@helixcode.com)
+ *     Miguel de Icaza (miguel@ximian.com)
  *     Bertrand Guiheneuf (bg@aful.org)
  *     And just about everyone else in evolution ...
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index b2b5913936..0ba539c84e 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* subscribe-dialog.c: Subscribe dialog */
 /*
- *  Authors: Chris Toshok <toshok@helixcode.com>
+ *  Authors: Chris Toshok <toshok@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/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
index c37c93080f..b25d76bb9a 100644
--- a/mail/subscribe-dialog.h
+++ b/mail/subscribe-dialog.h
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@helixcode.com>
+ *  Authors: Chris Toshok <toshok@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/mail/test-mail.c b/mail/test-mail.c
index ae77a69722..a3365d06ad 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -4,7 +4,7 @@
  * Author:
  *   Miguel de Icaza (miguel@kernel.org)
  *
- * (C) 2000 Helix Code, Inc.
+ * (C) 2000 Ximian, Inc.
  */
 
 #include <config.h>