fixed copyright notices

svn path=/trunk/; revision=35663

95 files changed, 95 insertions, 95 deletions

diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 3c6e28527b..3885b89447 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -5,7 +5,7 @@
  *    Jeffrey Stedfast <fejj@ximian.com>
  *    Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index c20da7f1bf..c21930e8a8 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -4,7 +4,7 @@
  *    Jeffrey Stedfast <fejj@ximian.com>
  *    Dan Winship <danw@ximian.com>
  *
- *  Copyright 2001-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 0d9549c89c..91a9d25cbe 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-account-prefs.h b/mail/em-account-prefs.h
index 60d7b6e962..a563470c35 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-composer-prefs.c b/mail/em-composer-prefs.c
index 87cdd0d4de..0c0a14859b 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-composer-prefs.h b/mail/em-composer-prefs.h
index d9d4b0c3a8..d0e7682b6c 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-composer-utils.c b/mail/em-composer-utils.c
index ef72fd6e4a..ad257b6237 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-composer-utils.h b/mail/em-composer-utils.h
index 4af2c26f48..147fb41049 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-config.c b/mail/em-config.c
index 840d64114e..f350074701 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-config.h b/mail/em-config.h
index d09e3e2bdf..6200164972 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Michel Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-event.c b/mail/em-event.c
index 114f40a20e..ec72d4ccc5 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-event.h b/mail/em-event.h
index 2d1f1a3033..d8e93f1b34 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Michel Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-filter-context.c b/mail/em-filter-context.c
index 6c11261d12..c3c66680c5 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index 051e600bd7..f0a7b66f7d 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 20bf0836bc..34cfe7f7ac 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h
index 599372a308..1d96195875 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index e159296640..ee25acbfc7 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright(C)2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index 042ab5d504..bbf2576703 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 6f9a9e2c28..7db52f547d 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright(C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 93953cd56b..9053571db0 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 316e7f8435..8f27989189 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -3,7 +3,7 @@
  *  Authors: Jon Trowbridge <trow@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001-2002 Ximian, Inc.(www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-filter-source-element.h b/mail/em-filter-source-element.h
index 6f3d1b2ccf..6c2bf3ec52 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -3,7 +3,7 @@
  *  Authors: Jon Trowbridge <trow@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001-2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-browser.c b/mail/em-folder-browser.c
index bc76a9c83e..ce17ea2f54 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -3,7 +3,7 @@
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-browser.h b/mail/em-folder-browser.h
index 4a1aaa185c..4d501b04b6 100644
--- a/mail/em-folder-browser.h
+++ b/mail/em-folder-browser.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index fa96101306..06f1416102 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index bae3b10ff2..0fb9cd9b4f 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selection.c b/mail/em-folder-selection.c
index 655a16aa6f..889eccf41e 100644
--- a/mail/em-folder-selection.c
+++ b/mail/em-folder-selection.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selection.h b/mail/em-folder-selection.h
index 3b00642b36..ee5f755225 100644
--- a/mail/em-folder-selection.h
+++ b/mail/em-folder-selection.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selector.c b/mail/em-folder-selector.c
index 1fac3210df..8d7351b049 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-selector.h b/mail/em-folder-selector.h
index fa783bb892..ced6448101 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index ee9c24cb66..ce6e15a851 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 33fe50999f..a8b311a150 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-tree.c b/mail/em-folder-tree.c
index a2d4b68cf4..ea108daad6 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-tree.h b/mail/em-folder-tree.h
index 97ae8e8ce0..63b32376a0 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-utils.c b/mail/em-folder-utils.c
index d030731a90..aae43e2441 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -3,7 +3,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-utils.h b/mail/em-folder-utils.h
index 7d98679d17..df11527f5a 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -3,7 +3,7 @@
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *           Rodney Dawes <dobey@novell.com>
  *
- *  Copyright 2003-2005 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-view.c b/mail/em-folder-view.c
index bcb303617c..c5e6d1047a 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-folder-view.h b/mail/em-folder-view.h
index 92a55344a7..503aad0118 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-hook.c b/mail/em-format-hook.c
index 8b2f49f91e..d548418493 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-hook.h b/mail/em-format-hook.h
index 387330b69e..9a2d8c9b4f 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Michel Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-html-display.c b/mail/em-format-html-display.c
index 3a04fcd4a8..d34f08a837 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-html-print.c b/mail/em-format-html-print.c
index 00ffc7b615..cfff244dd2 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-html.c b/mail/em-format-html.c
index 004c787458..8b3e788140 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-html.h b/mail/em-format-html.h
index b7f44f6bf4..942e082d70 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-quote.c b/mail/em-format-quote.c
index 6493635b87..f7427eb284 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format-quote.h b/mail/em-format-quote.h
index 8e7f7f5212..1c121c8205 100644
--- a/mail/em-format-quote.h
+++ b/mail/em-format-quote.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format.c b/mail/em-format.c
index 6f2a2125d2..4c887dfd44 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -3,7 +3,7 @@
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-format.h b/mail/em-format.h
index 6dba5f8b05..1804c85cec 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-html-stream.h b/mail/em-html-stream.h
index e8be92eb9b..fd2df99b1d 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 59075ef5d3..42db3bcca1 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -2,7 +2,7 @@
  *
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 24341c960f..d2bf9983f9 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Vivek Jain <jvivek@novell.com>
  *
- *  Copyright 2005 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-junk-hook.h b/mail/em-junk-hook.h
index 940607e323..3dfc3347eb 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Vivek Jain <jvivek@novell.com>
  *
- *  Copyright 2005 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 4ffe2874fd..6b7c4e8cae 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 6688f6f600..6400f2d2d0 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-menu.c b/mail/em-menu.c
index 567f5876f3..a6a60af235 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-menu.h b/mail/em-menu.h
index ecf3439648..c74113f620 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Michel Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-message-browser.c b/mail/em-message-browser.c
index 638de4b698..fc507bb2ce 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-migrate.c b/mail/em-migrate.c
index cfb4a5f435..6fa53646e8 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-migrate.h b/mail/em-migrate.h
index 7bf23abece..e752b513e6 100644
--- a/mail/em-migrate.h
+++ b/mail/em-migrate.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-network-prefs.c b/mail/em-network-prefs.c
index d6496eafdc..ea44ef46b2 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Veerapuram Varadhan  <vvaradhan@novell.com>
  *
- *  Copyright 2007 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-network-prefs.h b/mail/em-network-prefs.h
index 10266c3f1c..c0fa2ad4f9 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Veerapuram Varadhan  <vvaradhan@novell.com>
  *
- *  Copyright 2007 Novell, Inc. (www.novell.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-popup.c b/mail/em-popup.c
index fcc6e32d5b..76e59daad3 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-popup.h b/mail/em-popup.h
index ea44cd4261..685ea8f684 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -2,7 +2,7 @@
  *
  *  Authors: Michel Zucchi <notzed@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-search-context.c b/mail/em-search-context.c
index 48320d2b2c..56c07a9a17 100644
--- a/mail/em-search-context.c
+++ b/mail/em-search-context.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-search-context.h b/mail/em-search-context.h
index 9220fc6ea4..8b691da270 100644
--- a/mail/em-search-context.h
+++ b/mail/em-search-context.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index d1c4bb3718..da22a2fa0b 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001-2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-stripsig-filter.h b/mail/em-stripsig-filter.h
index 9e3f42bd85..ba190eb747 100644
--- a/mail/em-stripsig-filter.h
+++ b/mail/em-stripsig-filter.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001-2004 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-sync-stream.c b/mail/em-sync-stream.c
index afa8bef8ea..e8aad7f31c 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -3,7 +3,7 @@
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *	     Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 50b56aa453..ff686f3d8c 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-utils.h b/mail/em-utils.h
index 6e5733eaef..045b922e3d 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/em-vfolder-context.c b/mail/em-vfolder-context.c
index 36ef03cf57..9db3781771 100644
--- a/mail/em-vfolder-context.c
+++ b/mail/em-vfolder-context.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright(C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index d47730f41f..893d4f4f50 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 9f5b4b0def..c97053280c 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2001-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index 84ee2e03e3..e6c60157ed 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 490ca9a778..65e56dfe6e 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright(C)2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Author: Not Zed <notzed@lostzed.mmc.com.au>
  *          Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index e9e7f6d537..18954f11bd 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2002 Ximian Inc.
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  *  Author: NotZed <notzed@ximian.com>
  *          Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index 29a27e3efb..d9a507c907 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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-factory.h b/mail/mail-config-factory.h
index 532e78d162..ea2113fca7 100644
--- a/mail/mail-config-factory.h
+++ b/mail/mail-config-factory.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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 80f7171a80..c8634e8853 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -3,7 +3,7 @@
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *           Radek Doulik     <rodo@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 01876b2cc8..4a1df5e2b2 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 324f0c3743..7c62d1873c 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index 5dae6bed3c..216b242c85 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 5563f30dec..ab4cc41006 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <NotZed@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 3a12da4daf..73c0d9fb06 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <NotZed@ximian.com>
  *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-session.c b/mail/mail-session.c
index a371101946..00e4c64405 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* mail-session.c: handles the session information and resource manipulation */
 /*
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-session.h b/mail/mail-session.h
index e217d34ddd..600b43c7a9 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 6843c8818f..ade9655684 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -3,7 +3,7 @@
  *  Authors: Radek Doulik <rodo@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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-signature-editor.h b/mail/mail-signature-editor.h
index 8ce8725b7a..029019f44a 100644
--- a/mail/mail-signature-editor.h
+++ b/mail/mail-signature-editor.h
@@ -3,7 +3,7 @@
  *  Authors:
  *    Radek Doulik <rodo@ximian.com>
  *
- *  Copyright 2001, 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index cfc09a7ff3..cf21b3c60f 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
- *  Copyright 2000-2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-list.c b/mail/message-list.c
index 14e177771a..ca370d8beb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4,7 +4,7 @@
  *           Bertrand Guiheneuf (bg@aful.org)
  *           And just about everyone else in evolution ...
  *
- *  Copyright 2000-2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-list.h b/mail/message-list.h
index 0f8758895d..ba1ef84b7d 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-tag-editor.c b/mail/message-tag-editor.c
index e28591faf2..d31ee93daf 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-tag-editor.h b/mail/message-tag-editor.h
index 408c6df9da..71a2a3c0d0 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-tag-followup.c b/mail/message-tag-followup.c
index d65008b6de..48f55456e4 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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/message-tag-followup.h b/mail/message-tag-followup.h
index ff0d35497f..35b39b940b 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -2,7 +2,7 @@
 /*
  *  Authors: Jeffrey Stedfast <fejj@ximian.com>
  *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.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