Updated VMime website URL.

220 files changed, 260 insertions, 238 deletions

diff --git a/examples/example1.cpp b/examples/example1.cpp
index cbe7d032..8cd271d3 100644
--- a/examples/example1.cpp
+++ b/examples/example1.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // to build a simple message.
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/examples/example2.cpp b/examples/example2.cpp
index 2b309fc4..70389076 100644
--- a/examples/example2.cpp
+++ b/examples/example2.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // to build a simple message with an attachment.
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/examples/example3.cpp b/examples/example3.cpp
index 9638356b..1bfa21c8 100644
--- a/examples/example3.cpp
+++ b/examples/example3.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // to build a complex message (HTML content, plain text and embedded image).
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/examples/example4.cpp b/examples/example4.cpp
index 27485264..437815ac 100644
--- a/examples/example4.cpp
+++ b/examples/example4.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // to enumerate the text parts in a message.
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/examples/example5.cpp b/examples/example5.cpp
index c1079a3b..3404be97 100644
--- a/examples/example5.cpp
+++ b/examples/example5.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // to enumerate the attachments in a message.
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/examples/example6.cpp b/examples/example6.cpp
index 5bd677e6..823ff3a0 100644
--- a/examples/example6.cpp
+++ b/examples/example6.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/examples/viewer/viewer.cpp b/examples/viewer/viewer.cpp
index 37077112..2f80b33c 100644
--- a/examples/viewer/viewer.cpp
+++ b/examples/viewer/viewer.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 // The user interface is written using GTK+ 2.6.
 //
 // For more information, please visit:
-// http://vmime.sourceforge.net/
+// http://www.vmime.org/
 //
 
 #include <iostream>
diff --git a/src/address.cpp b/src/address.cpp
index 7b63125b..b0e11521 100644
--- a/src/address.cpp
+++ b/src/address.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/addressList.cpp b/src/addressList.cpp
index fc9548b1..c6d9c9ad 100644
--- a/src/addressList.cpp
+++ b/src/addressList.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/base.cpp b/src/base.cpp
index 8e0845b0..235bedbf 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/body.cpp b/src/body.cpp
index a7c09d44..5438d2e0 100644
--- a/src/body.cpp
+++ b/src/body.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/bodyPart.cpp b/src/bodyPart.cpp
index c72a5096..6995ccac 100644
--- a/src/bodyPart.cpp
+++ b/src/bodyPart.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/charset.cpp b/src/charset.cpp
index 96b854ed..cc2ba9ba 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/component.cpp b/src/component.cpp
index 35b97071..c0301f7c 100644
--- a/src/component.cpp
+++ b/src/component.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/constants.cpp b/src/constants.cpp
index 66ed95f3..55de71fb 100644
--- a/src/constants.cpp
+++ b/src/constants.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/contentDisposition.cpp b/src/contentDisposition.cpp
index 5fa78b9f..a2c53843 100644
--- a/src/contentDisposition.cpp
+++ b/src/contentDisposition.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/contentDispositionField.cpp b/src/contentDispositionField.cpp
index be25eb75..bfbacc21 100644
--- a/src/contentDispositionField.cpp
+++ b/src/contentDispositionField.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/contentHandler.cpp b/src/contentHandler.cpp
index ced4cd3e..b786e979 100644
--- a/src/contentHandler.cpp
+++ b/src/contentHandler.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/contentTypeField.cpp b/src/contentTypeField.cpp
index 0ebe4636..0f2dc81f 100644
--- a/src/contentTypeField.cpp
+++ b/src/contentTypeField.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/dateTime.cpp b/src/dateTime.cpp
index 9cca0061..aba96e48 100644
--- a/src/dateTime.cpp
+++ b/src/dateTime.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/defaultAttachment.cpp b/src/defaultAttachment.cpp
index 43842eaf..fe0e6d2f 100644
--- a/src/defaultAttachment.cpp
+++ b/src/defaultAttachment.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/emptyContentHandler.cpp b/src/emptyContentHandler.cpp
index e266c678..dceef55e 100644
--- a/src/emptyContentHandler.cpp
+++ b/src/emptyContentHandler.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoder.cpp b/src/encoder.cpp
index 95944c0e..d2d2502f 100644
--- a/src/encoder.cpp
+++ b/src/encoder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoder7bit.cpp b/src/encoder7bit.cpp
index 27dd5162..2731cc86 100644
--- a/src/encoder7bit.cpp
+++ b/src/encoder7bit.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoder8bit.cpp b/src/encoder8bit.cpp
index 95d06f2f..e096938f 100644
--- a/src/encoder8bit.cpp
+++ b/src/encoder8bit.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderB64.cpp b/src/encoderB64.cpp
index 6229d3a3..405eac25 100644
--- a/src/encoderB64.cpp
+++ b/src/encoderB64.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderBinary.cpp b/src/encoderBinary.cpp
index ae13ea6b..6532a089 100644
--- a/src/encoderBinary.cpp
+++ b/src/encoderBinary.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderDefault.cpp b/src/encoderDefault.cpp
index c1c22985..26b63ba7 100644
--- a/src/encoderDefault.cpp
+++ b/src/encoderDefault.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderFactory.cpp b/src/encoderFactory.cpp
index 76f05f48..055dcecf 100644
--- a/src/encoderFactory.cpp
+++ b/src/encoderFactory.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderQP.cpp b/src/encoderQP.cpp
index 24a300a6..a021a051 100644
--- a/src/encoderQP.cpp
+++ b/src/encoderQP.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoderUUE.cpp b/src/encoderUUE.cpp
index 16b5a779..3e0ebea7 100644
--- a/src/encoderUUE.cpp
+++ b/src/encoderUUE.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 9d8bde13..632333fb 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/exception.cpp b/src/exception.cpp
index cbdc3f3d..4bbdefd3 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/fileAttachment.cpp b/src/fileAttachment.cpp
index c156eb98..423020b2 100644
--- a/src/fileAttachment.cpp
+++ b/src/fileAttachment.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/header.cpp b/src/header.cpp
index db6c7f89..a89f750d 100644
--- a/src/header.cpp
+++ b/src/header.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/headerField.cpp b/src/headerField.cpp
index 9fd7d5d6..72a3927e 100644
--- a/src/headerField.cpp
+++ b/src/headerField.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/headerFieldFactory.cpp b/src/headerFieldFactory.cpp
index 01258d85..93e1b7fe 100644
--- a/src/headerFieldFactory.cpp
+++ b/src/headerFieldFactory.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/htmlTextPart.cpp b/src/htmlTextPart.cpp
index 0d2fdf17..36a82217 100644
--- a/src/htmlTextPart.cpp
+++ b/src/htmlTextPart.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/mailbox.cpp b/src/mailbox.cpp
index 97d79d2a..9580d8e4 100644
--- a/src/mailbox.cpp
+++ b/src/mailbox.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/mailboxField.cpp b/src/mailboxField.cpp
index af220c50..3580b011 100644
--- a/src/mailboxField.cpp
+++ b/src/mailboxField.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/mailboxGroup.cpp b/src/mailboxGroup.cpp
index a73808be..c018c3ce 100644
--- a/src/mailboxGroup.cpp
+++ b/src/mailboxGroup.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/mailboxList.cpp b/src/mailboxList.cpp
index e18fad0b..fe636e1d 100644
--- a/src/mailboxList.cpp
+++ b/src/mailboxList.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/mediaType.cpp b/src/mediaType.cpp
index e1970030..deb0c129 100644
--- a/src/mediaType.cpp
+++ b/src/mediaType.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/message.cpp b/src/message.cpp
index b683ad9d..8956865f 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messageBuilder.cpp b/src/messageBuilder.cpp
index 0b4f0b9e..7081332f 100644
--- a/src/messageBuilder.cpp
+++ b/src/messageBuilder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messageId.cpp b/src/messageId.cpp
index 695b0645..815266d5 100644
--- a/src/messageId.cpp
+++ b/src/messageId.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messageParser.cpp b/src/messageParser.cpp
index aedbecae..6ef9652a 100644
--- a/src/messageParser.cpp
+++ b/src/messageParser.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPConnection.cpp b/src/messaging/IMAPConnection.cpp
index cc559edc..fa0e6af8 100644
--- a/src/messaging/IMAPConnection.cpp
+++ b/src/messaging/IMAPConnection.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPFolder.cpp b/src/messaging/IMAPFolder.cpp
index 16d4b42f..98737165 100644
--- a/src/messaging/IMAPFolder.cpp
+++ b/src/messaging/IMAPFolder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPMessage.cpp b/src/messaging/IMAPMessage.cpp
index 07983894..bfe72159 100644
--- a/src/messaging/IMAPMessage.cpp
+++ b/src/messaging/IMAPMessage.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPStore.cpp b/src/messaging/IMAPStore.cpp
index 9783077a..809957a4 100644
--- a/src/messaging/IMAPStore.cpp
+++ b/src/messaging/IMAPStore.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPTag.cpp b/src/messaging/IMAPTag.cpp
index c70505a8..f5c669a0 100644
--- a/src/messaging/IMAPTag.cpp
+++ b/src/messaging/IMAPTag.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/IMAPUtils.cpp b/src/messaging/IMAPUtils.cpp
index 93996f34..de0c8d30 100644
--- a/src/messaging/IMAPUtils.cpp
+++ b/src/messaging/IMAPUtils.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/POP3Folder.cpp b/src/messaging/POP3Folder.cpp
index 4f77798e..096c9db6 100644
--- a/src/messaging/POP3Folder.cpp
+++ b/src/messaging/POP3Folder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/POP3Message.cpp b/src/messaging/POP3Message.cpp
index f5a5226c..633f9491 100644
--- a/src/messaging/POP3Message.cpp
+++ b/src/messaging/POP3Message.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/POP3Store.cpp b/src/messaging/POP3Store.cpp
index 6bb6c24c..1ba77f8c 100644
--- a/src/messaging/POP3Store.cpp
+++ b/src/messaging/POP3Store.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/SMTPTransport.cpp b/src/messaging/SMTPTransport.cpp
index 57923ea4..bd10fbe0 100644
--- a/src/messaging/SMTPTransport.cpp
+++ b/src/messaging/SMTPTransport.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/authHelper.cpp b/src/messaging/authHelper.cpp
index d8181291..9da19043 100644
--- a/src/messaging/authHelper.cpp
+++ b/src/messaging/authHelper.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/authenticationInfos.cpp b/src/messaging/authenticationInfos.cpp
index 01ee7db8..99044f2f 100644
--- a/src/messaging/authenticationInfos.cpp
+++ b/src/messaging/authenticationInfos.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/authenticator.cpp b/src/messaging/authenticator.cpp
index e3bc5de2..d7d9e372 100644
--- a/src/messaging/authenticator.cpp
+++ b/src/messaging/authenticator.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/builtinServices.inl b/src/messaging/builtinServices.inl
index 2835ad33..d98e7949 100644
--- a/src/messaging/builtinServices.inl
+++ b/src/messaging/builtinServices.inl
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/defaultAuthenticator.cpp b/src/messaging/defaultAuthenticator.cpp
index 8e366567..db027339 100644
--- a/src/messaging/defaultAuthenticator.cpp
+++ b/src/messaging/defaultAuthenticator.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/events.cpp b/src/messaging/events.cpp
index d7e0a367..edc736c1 100644
--- a/src/messaging/events.cpp
+++ b/src/messaging/events.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/folder.cpp b/src/messaging/folder.cpp
index 64d421aa..8b47e639 100644
--- a/src/messaging/folder.cpp
+++ b/src/messaging/folder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/maildirFolder.cpp b/src/messaging/maildirFolder.cpp
index 240fdc8b..85e041aa 100644
--- a/src/messaging/maildirFolder.cpp
+++ b/src/messaging/maildirFolder.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/maildirMessage.cpp b/src/messaging/maildirMessage.cpp
index a118416d..0a4c27e8 100644
--- a/src/messaging/maildirMessage.cpp
+++ b/src/messaging/maildirMessage.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildirStore.cpp
index 1bb5ace2..7d8e493d 100644
--- a/src/messaging/maildirStore.cpp
+++ b/src/messaging/maildirStore.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/maildirUtils.cpp b/src/messaging/maildirUtils.cpp
index a06b9c84..3479bdeb 100644
--- a/src/messaging/maildirUtils.cpp
+++ b/src/messaging/maildirUtils.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/message.cpp b/src/messaging/message.cpp
index d2ada76d..994adcdb 100644
--- a/src/messaging/message.cpp
+++ b/src/messaging/message.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/service.cpp b/src/messaging/service.cpp
index 4b25608c..c8872758 100644
--- a/src/messaging/service.cpp
+++ b/src/messaging/service.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index a4ce70a4..ea7166ba 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/session.cpp b/src/messaging/session.cpp
index b096ba08..a1f5d36e 100644
--- a/src/messaging/session.cpp
+++ b/src/messaging/session.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/simpleAuthenticator.cpp b/src/messaging/simpleAuthenticator.cpp
index 777bc16c..1dee6cae 100644
--- a/src/messaging/simpleAuthenticator.cpp
+++ b/src/messaging/simpleAuthenticator.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/url.cpp b/src/messaging/url.cpp
index 598bc5b8..1ee9607a 100644
--- a/src/messaging/url.cpp
+++ b/src/messaging/url.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/messaging/urlUtils.cpp b/src/messaging/urlUtils.cpp
index 04603115..7dc1e30f 100644
--- a/src/messaging/urlUtils.cpp
+++ b/src/messaging/urlUtils.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/options.cpp b/src/options.cpp
index d99b248b..a698e17e 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/parameter.cpp b/src/parameter.cpp
index a4c97fc9..1cc2e697 100644
--- a/src/parameter.cpp
+++ b/src/parameter.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/parameterFactory.cpp b/src/parameterFactory.cpp
index cd67ce81..77450409 100644
--- a/src/parameterFactory.cpp
+++ b/src/parameterFactory.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/parameterizedHeaderField.cpp b/src/parameterizedHeaderField.cpp
index 9190525c..92631d9d 100644
--- a/src/parameterizedHeaderField.cpp
+++ b/src/parameterizedHeaderField.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/plainTextPart.cpp b/src/plainTextPart.cpp
index cfaf35a4..8e065c76 100644
--- a/src/plainTextPart.cpp
+++ b/src/plainTextPart.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/platformDependant.cpp b/src/platformDependant.cpp
index a5a2de09..d6a79613 100644
--- a/src/platformDependant.cpp
+++ b/src/platformDependant.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/platforms/posix/posixFile.cpp b/src/platforms/posix/posixFile.cpp
index cace9180..5448d894 100644
--- a/src/platforms/posix/posixFile.cpp
+++ b/src/platforms/posix/posixFile.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp
index 32fe02bc..c95d6f0e 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/platforms/posix/posixHandler.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/platforms/posix/posixSocket.cpp b/src/platforms/posix/posixSocket.cpp
index 1be5788c..a958680f 100644
--- a/src/platforms/posix/posixSocket.cpp
+++ b/src/platforms/posix/posixSocket.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/propertySet.cpp b/src/propertySet.cpp
index fa4b7a27..17117138 100644
--- a/src/propertySet.cpp
+++ b/src/propertySet.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/relay.cpp b/src/relay.cpp
index 03d881a5..2eef657b 100644
--- a/src/relay.cpp
+++ b/src/relay.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/streamContentHandler.cpp b/src/streamContentHandler.cpp
index e0ff56bc..5da7ffba 100644
--- a/src/streamContentHandler.cpp
+++ b/src/streamContentHandler.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/stringContentHandler.cpp b/src/stringContentHandler.cpp
index 4c67756d..812d8550 100644
--- a/src/stringContentHandler.cpp
+++ b/src/stringContentHandler.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/text.cpp b/src/text.cpp
index 613cbbad..a24d6668 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/textPartFactory.cpp b/src/textPartFactory.cpp
index bfc2fa64..c76697b2 100644
--- a/src/textPartFactory.cpp
+++ b/src/textPartFactory.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/typeAdapter.cpp b/src/typeAdapter.cpp
index 2d0b73ed..327d5c37 100644
--- a/src/typeAdapter.cpp
+++ b/src/typeAdapter.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/datetimeUtils.cpp b/src/utility/datetimeUtils.cpp
index 3062525b..ef3942cd 100644
--- a/src/utility/datetimeUtils.cpp
+++ b/src/utility/datetimeUtils.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/md5.cpp b/src/utility/md5.cpp
index 0bfc9f3e..b5899e36 100644
--- a/src/utility/md5.cpp
+++ b/src/utility/md5.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/path.cpp b/src/utility/path.cpp
index b042ff1b..5e6162ab 100644
--- a/src/utility/path.cpp
+++ b/src/utility/path.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/random.cpp b/src/utility/random.cpp
index 81ac6c56..ddc5639f 100644
--- a/src/utility/random.cpp
+++ b/src/utility/random.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/stream.cpp b/src/utility/stream.cpp
index 6360de17..397bf20b 100644
--- a/src/utility/stream.cpp
+++ b/src/utility/stream.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/stringProxy.cpp b/src/utility/stringProxy.cpp
index 30b49cd4..798cbf1a 100644
--- a/src/utility/stringProxy.cpp
+++ b/src/utility/stringProxy.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/utility/stringUtils.cpp b/src/utility/stringUtils.cpp
index 4795c8d2..70d8aa8e 100644
--- a/src/utility/stringUtils.cpp
+++ b/src/utility/stringUtils.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/word.cpp b/src/word.cpp
index e2bdba66..be7cfc9c 100644
--- a/src/word.cpp
+++ b/src/word.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/charset/main.cpp b/tests/charset/main.cpp
index 5121a52d..ac1a471d 100644
--- a/tests/charset/main.cpp
+++ b/tests/charset/main.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/bodyPartTest.cpp b/tests/parser/bodyPartTest.cpp
index 0bfdb1e1..87d4c1ba 100644
--- a/tests/parser/bodyPartTest.cpp
+++ b/tests/parser/bodyPartTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/encoderTest.cpp b/tests/parser/encoderTest.cpp
index a4aa63e0..5d27fffc 100644
--- a/tests/parser/encoderTest.cpp
+++ b/tests/parser/encoderTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/headerTest.cpp b/tests/parser/headerTest.cpp
index 08ada492..4ee5b443 100644
--- a/tests/parser/headerTest.cpp
+++ b/tests/parser/headerTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp
index a7e416cd..cbfaf8d2 100644
--- a/tests/parser/mailboxTest.cpp
+++ b/tests/parser/mailboxTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/mediaTypeTest.cpp b/tests/parser/mediaTypeTest.cpp
index b1a00be7..14e07715 100644
--- a/tests/parser/mediaTypeTest.cpp
+++ b/tests/parser/mediaTypeTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/testUtils.hpp b/tests/parser/testUtils.hpp
index c8833004..46de7968 100644
--- a/tests/parser/testUtils.hpp
+++ b/tests/parser/testUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/parser/textTest.cpp b/tests/parser/textTest.cpp
index 7f384320..504c4a92 100644
--- a/tests/parser/textTest.cpp
+++ b/tests/parser/textTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/utility/md5Test.cpp b/tests/utility/md5Test.cpp
index f5025865..94fb3cd2 100644
--- a/tests/utility/md5Test.cpp
+++ b/tests/utility/md5Test.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/utility/pathTest.cpp b/tests/utility/pathTest.cpp
index 0d593c92..7710cf13 100644
--- a/tests/utility/pathTest.cpp
+++ b/tests/utility/pathTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/utility/stringProxyTest.cpp b/tests/utility/stringProxyTest.cpp
index 857d59b1..8c719920 100644
--- a/tests/utility/stringProxyTest.cpp
+++ b/tests/utility/stringProxyTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/tests/utility/stringUtilsTest.cpp b/tests/utility/stringUtilsTest.cpp
index 62422747..dee01f8e 100644
--- a/tests/utility/stringUtilsTest.cpp
+++ b/tests/utility/stringUtilsTest.cpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/address.hpp b/vmime/address.hpp
index 792a9d7e..405908ae 100644
--- a/vmime/address.hpp
+++ b/vmime/address.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/addressList.hpp b/vmime/addressList.hpp
index 57558218..f5629ebe 100644
--- a/vmime/addressList.hpp
+++ b/vmime/addressList.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/attachment.hpp b/vmime/attachment.hpp
index 1a386753..60c7b29d 100644
--- a/vmime/attachment.hpp
+++ b/vmime/attachment.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/base.hpp b/vmime/base.hpp
index 0558bed4..7f3fa670 100644
--- a/vmime/base.hpp
+++ b/vmime/base.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/body.hpp b/vmime/body.hpp
index 5c03f7fe..56cc54b1 100644
--- a/vmime/body.hpp
+++ b/vmime/body.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/bodyPart.hpp b/vmime/bodyPart.hpp
index 48048bec..60c64528 100644
--- a/vmime/bodyPart.hpp
+++ b/vmime/bodyPart.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/charset.hpp b/vmime/charset.hpp
index d5d545c5..3c24a0ca 100644
--- a/vmime/charset.hpp
+++ b/vmime/charset.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/component.hpp b/vmime/component.hpp
index a040d381..5a22bfd5 100644
--- a/vmime/component.hpp
+++ b/vmime/component.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/constants.hpp b/vmime/constants.hpp
index 607ad2c8..89e6f0c3 100644
--- a/vmime/constants.hpp
+++ b/vmime/constants.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free SOFTWARE; you can redistribute it and/or
diff --git a/vmime/contentDisposition.hpp b/vmime/contentDisposition.hpp
index b555bf89..eb56130e 100644
--- a/vmime/contentDisposition.hpp
+++ b/vmime/contentDisposition.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/contentDispositionField.hpp b/vmime/contentDispositionField.hpp
index a8da457b..dc62baa0 100644
--- a/vmime/contentDispositionField.hpp
+++ b/vmime/contentDispositionField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/contentHandler.hpp b/vmime/contentHandler.hpp
index 3fee6d88..7f491f2e 100644
--- a/vmime/contentHandler.hpp
+++ b/vmime/contentHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/contentTypeField.hpp b/vmime/contentTypeField.hpp
index 6c96a02b..a0e222b5 100644
--- a/vmime/contentTypeField.hpp
+++ b/vmime/contentTypeField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/dateTime.hpp b/vmime/dateTime.hpp
index c9bbc0c5..0655b92c 100644
--- a/vmime/dateTime.hpp
+++ b/vmime/dateTime.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/defaultAttachment.hpp b/vmime/defaultAttachment.hpp
index cdc44fbd..65589b48 100644
--- a/vmime/defaultAttachment.hpp
+++ b/vmime/defaultAttachment.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/emptyContentHandler.hpp b/vmime/emptyContentHandler.hpp
index b02d3182..ca44a12c 100644
--- a/vmime/emptyContentHandler.hpp
+++ b/vmime/emptyContentHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoder.hpp b/vmime/encoder.hpp
index 573f56da..3fe81bed 100644
--- a/vmime/encoder.hpp
+++ b/vmime/encoder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoder7bit.hpp b/vmime/encoder7bit.hpp
index 5641eb76..0997b704 100644
--- a/vmime/encoder7bit.hpp
+++ b/vmime/encoder7bit.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoder8bit.hpp b/vmime/encoder8bit.hpp
index 64167caf..e58474a4 100644
--- a/vmime/encoder8bit.hpp
+++ b/vmime/encoder8bit.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderB64.hpp b/vmime/encoderB64.hpp
index 84b6b1e0..5643b9c2 100644
--- a/vmime/encoderB64.hpp
+++ b/vmime/encoderB64.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderBinary.hpp b/vmime/encoderBinary.hpp
index cdee7172..bfab96d6 100644
--- a/vmime/encoderBinary.hpp
+++ b/vmime/encoderBinary.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderDefault.hpp b/vmime/encoderDefault.hpp
index cb0f75c9..ae37eaf2 100644
--- a/vmime/encoderDefault.hpp
+++ b/vmime/encoderDefault.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderFactory.hpp b/vmime/encoderFactory.hpp
index 2f17e99f..d466b17c 100644
--- a/vmime/encoderFactory.hpp
+++ b/vmime/encoderFactory.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderQP.hpp b/vmime/encoderQP.hpp
index 686a9cc6..b1ce2327 100644
--- a/vmime/encoderQP.hpp
+++ b/vmime/encoderQP.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoderUUE.hpp b/vmime/encoderUUE.hpp
index dc6d1bb7..e54c1ce1 100644
--- a/vmime/encoderUUE.hpp
+++ b/vmime/encoderUUE.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/encoding.hpp b/vmime/encoding.hpp
index 75c798da..5a741144 100644
--- a/vmime/encoding.hpp
+++ b/vmime/encoding.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/exception.hpp b/vmime/exception.hpp
index a251a064..763d2a5c 100644
--- a/vmime/exception.hpp
+++ b/vmime/exception.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/fileAttachment.hpp b/vmime/fileAttachment.hpp
index d9c88aba..038006c5 100644
--- a/vmime/fileAttachment.hpp
+++ b/vmime/fileAttachment.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/genericField.hpp b/vmime/genericField.hpp
index 55e6f1fa..34c6e9e4 100644
--- a/vmime/genericField.hpp
+++ b/vmime/genericField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/genericParameter.hpp b/vmime/genericParameter.hpp
index 681c6119..79d55ba4 100644
--- a/vmime/genericParameter.hpp
+++ b/vmime/genericParameter.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/header.hpp b/vmime/header.hpp
index 3f80c96b..42b465b2 100644
--- a/vmime/header.hpp
+++ b/vmime/header.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/headerField.hpp b/vmime/headerField.hpp
index d5f7160d..ba4f5601 100644
--- a/vmime/headerField.hpp
+++ b/vmime/headerField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/headerFieldFactory.hpp b/vmime/headerFieldFactory.hpp
index 35fcae07..bad8bfe7 100644
--- a/vmime/headerFieldFactory.hpp
+++ b/vmime/headerFieldFactory.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/htmlTextPart.hpp b/vmime/htmlTextPart.hpp
index e033461d..3dd31ae4 100644
--- a/vmime/htmlTextPart.hpp
+++ b/vmime/htmlTextPart.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/mailbox.hpp b/vmime/mailbox.hpp
index 51b51baf..b34300f0 100644
--- a/vmime/mailbox.hpp
+++ b/vmime/mailbox.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/mailboxField.hpp b/vmime/mailboxField.hpp
index fd3e18da..9a97d7a0 100644
--- a/vmime/mailboxField.hpp
+++ b/vmime/mailboxField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/mailboxGroup.hpp b/vmime/mailboxGroup.hpp
index daf4ee91..413d353d 100644
--- a/vmime/mailboxGroup.hpp
+++ b/vmime/mailboxGroup.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/mailboxList.hpp b/vmime/mailboxList.hpp
index f737fd1f..5b77e5b2 100644
--- a/vmime/mailboxList.hpp
+++ b/vmime/mailboxList.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/mediaType.hpp b/vmime/mediaType.hpp
index 5bca556d..9a6b2f69 100644
--- a/vmime/mediaType.hpp
+++ b/vmime/mediaType.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/message.hpp b/vmime/message.hpp
index 7140a28d..73bcf3f5 100644
--- a/vmime/message.hpp
+++ b/vmime/message.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messageBuilder.hpp b/vmime/messageBuilder.hpp
index 7ba81fda..3c371d02 100644
--- a/vmime/messageBuilder.hpp
+++ b/vmime/messageBuilder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messageId.hpp b/vmime/messageId.hpp
index ef954fb7..83288c17 100644
--- a/vmime/messageId.hpp
+++ b/vmime/messageId.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messageParser.hpp b/vmime/messageParser.hpp
index 747bf1f5..71d52547 100644
--- a/vmime/messageParser.hpp
+++ b/vmime/messageParser.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPConnection.hpp b/vmime/messaging/IMAPConnection.hpp
index 1b8c25a2..b4710258 100644
--- a/vmime/messaging/IMAPConnection.hpp
+++ b/vmime/messaging/IMAPConnection.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPFolder.hpp b/vmime/messaging/IMAPFolder.hpp
index e09d2a4f..6dfd398b 100644
--- a/vmime/messaging/IMAPFolder.hpp
+++ b/vmime/messaging/IMAPFolder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPMessage.hpp b/vmime/messaging/IMAPMessage.hpp
index 092b0e08..3145498e 100644
--- a/vmime/messaging/IMAPMessage.hpp
+++ b/vmime/messaging/IMAPMessage.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPParser.hpp b/vmime/messaging/IMAPParser.hpp
index dc0caa23..352905d4 100644
--- a/vmime/messaging/IMAPParser.hpp
+++ b/vmime/messaging/IMAPParser.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPStore.hpp b/vmime/messaging/IMAPStore.hpp
index bf3ff745..b5826820 100644
--- a/vmime/messaging/IMAPStore.hpp
+++ b/vmime/messaging/IMAPStore.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPTag.hpp b/vmime/messaging/IMAPTag.hpp
index 845acc14..09e00e83 100644
--- a/vmime/messaging/IMAPTag.hpp
+++ b/vmime/messaging/IMAPTag.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/IMAPUtils.hpp b/vmime/messaging/IMAPUtils.hpp
index 90227b00..f61c363b 100644
--- a/vmime/messaging/IMAPUtils.hpp
+++ b/vmime/messaging/IMAPUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/POP3Folder.hpp b/vmime/messaging/POP3Folder.hpp
index a982aa00..a7af9ade 100644
--- a/vmime/messaging/POP3Folder.hpp
+++ b/vmime/messaging/POP3Folder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/POP3Message.hpp b/vmime/messaging/POP3Message.hpp
index 34b72dfa..5a843c1c 100644
--- a/vmime/messaging/POP3Message.hpp
+++ b/vmime/messaging/POP3Message.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/POP3Store.hpp b/vmime/messaging/POP3Store.hpp
index 11108961..dff97c04 100644
--- a/vmime/messaging/POP3Store.hpp
+++ b/vmime/messaging/POP3Store.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/SMTPTransport.hpp b/vmime/messaging/SMTPTransport.hpp
index 07815b4e..5bd01d05 100644
--- a/vmime/messaging/SMTPTransport.hpp
+++ b/vmime/messaging/SMTPTransport.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/authHelper.hpp b/vmime/messaging/authHelper.hpp
index 3a0a392d..1227b283 100644
--- a/vmime/messaging/authHelper.hpp
+++ b/vmime/messaging/authHelper.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/authenticationInfos.hpp b/vmime/messaging/authenticationInfos.hpp
index 264d6183..2ae35ad4 100644
--- a/vmime/messaging/authenticationInfos.hpp
+++ b/vmime/messaging/authenticationInfos.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/authenticator.hpp b/vmime/messaging/authenticator.hpp
index 9b85d4c4..374a48e7 100644
--- a/vmime/messaging/authenticator.hpp
+++ b/vmime/messaging/authenticator.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/defaultAuthenticator.hpp b/vmime/messaging/defaultAuthenticator.hpp
index b1447ea7..b3f5b811 100644
--- a/vmime/messaging/defaultAuthenticator.hpp
+++ b/vmime/messaging/defaultAuthenticator.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/events.hpp b/vmime/messaging/events.hpp
index 7c43dc09..93dc9b36 100644
--- a/vmime/messaging/events.hpp
+++ b/vmime/messaging/events.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/folder.hpp b/vmime/messaging/folder.hpp
index f86dafc2..9a8a1155 100644
--- a/vmime/messaging/folder.hpp
+++ b/vmime/messaging/folder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/maildirFolder.hpp b/vmime/messaging/maildirFolder.hpp
index 97d5e4a7..cea2044e 100644
--- a/vmime/messaging/maildirFolder.hpp
+++ b/vmime/messaging/maildirFolder.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/maildirMessage.hpp b/vmime/messaging/maildirMessage.hpp
index 829d8e2a..63214284 100644
--- a/vmime/messaging/maildirMessage.hpp
+++ b/vmime/messaging/maildirMessage.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/maildirStore.hpp b/vmime/messaging/maildirStore.hpp
index 48fb8674..cff31e3f 100644
--- a/vmime/messaging/maildirStore.hpp
+++ b/vmime/messaging/maildirStore.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/maildirUtils.hpp b/vmime/messaging/maildirUtils.hpp
index cdefc97e..5bbe1fae 100644
--- a/vmime/messaging/maildirUtils.hpp
+++ b/vmime/messaging/maildirUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/message.hpp b/vmime/messaging/message.hpp
index 9859f56d..ee32c753 100644
--- a/vmime/messaging/message.hpp
+++ b/vmime/messaging/message.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/progressionListener.hpp b/vmime/messaging/progressionListener.hpp
index 25771efd..a1008d16 100644
--- a/vmime/messaging/progressionListener.hpp
+++ b/vmime/messaging/progressionListener.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/service.hpp b/vmime/messaging/service.hpp
index b3b66bcf..212e2c55 100644
--- a/vmime/messaging/service.hpp
+++ b/vmime/messaging/service.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/serviceFactory.hpp b/vmime/messaging/serviceFactory.hpp
index 41b3e932..513697c0 100644
--- a/vmime/messaging/serviceFactory.hpp
+++ b/vmime/messaging/serviceFactory.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/serviceInfos.hpp b/vmime/messaging/serviceInfos.hpp
index 94cce44c..b83a24d8 100644
--- a/vmime/messaging/serviceInfos.hpp
+++ b/vmime/messaging/serviceInfos.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/session.hpp b/vmime/messaging/session.hpp
index 26337ed4..ae9845c3 100644
--- a/vmime/messaging/session.hpp
+++ b/vmime/messaging/session.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/simpleAuthenticator.hpp b/vmime/messaging/simpleAuthenticator.hpp
index 5aa28f3f..bf09f43b 100644
--- a/vmime/messaging/simpleAuthenticator.hpp
+++ b/vmime/messaging/simpleAuthenticator.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/socket.hpp b/vmime/messaging/socket.hpp
index e795df6c..dbbed819 100644
--- a/vmime/messaging/socket.hpp
+++ b/vmime/messaging/socket.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/store.hpp b/vmime/messaging/store.hpp
index 632a6e64..6b5d8be7 100644
--- a/vmime/messaging/store.hpp
+++ b/vmime/messaging/store.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/timeoutHandler.hpp b/vmime/messaging/timeoutHandler.hpp
index 9a142a6f..79af504e 100644
--- a/vmime/messaging/timeoutHandler.hpp
+++ b/vmime/messaging/timeoutHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/transport.hpp b/vmime/messaging/transport.hpp
index 9ef45a65..7b48883e 100644
--- a/vmime/messaging/transport.hpp
+++ b/vmime/messaging/transport.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/messaging/url.hpp b/vmime/messaging/url.hpp
index cc1cab1e..cd0655fc 100644
--- a/vmime/messaging/url.hpp
+++ b/vmime/messaging/url.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -52,7 +52,7 @@ public:
 
 	/** Construct an URL from a string (parse the URL components).
 	  *
-	  * @param s full URL string (eg. http://vmime.sourceforge.net:80/download.html
+	  * @param s full URL string (eg. http://www.vmime.org:80/download.html
 	  */
 	url(const string& s);
 
diff --git a/vmime/messaging/urlUtils.hpp b/vmime/messaging/urlUtils.hpp
index 3ca41b1c..6e55d0cf 100644
--- a/vmime/messaging/urlUtils.hpp
+++ b/vmime/messaging/urlUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/options.hpp b/vmime/options.hpp
index b76ec91b..6f70ab67 100644
--- a/vmime/options.hpp
+++ b/vmime/options.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/parameter.hpp b/vmime/parameter.hpp
index 125e7b38..605b7ba8 100644
--- a/vmime/parameter.hpp
+++ b/vmime/parameter.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/parameterFactory.hpp b/vmime/parameterFactory.hpp
index a3ee411e..3c05f4f8 100644
--- a/vmime/parameterFactory.hpp
+++ b/vmime/parameterFactory.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/parameterizedHeaderField.hpp b/vmime/parameterizedHeaderField.hpp
index b6418b37..3e971c1b 100644
--- a/vmime/parameterizedHeaderField.hpp
+++ b/vmime/parameterizedHeaderField.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/parserHelpers.hpp b/vmime/parserHelpers.hpp
index 97e8a668..36764ce9 100644
--- a/vmime/parserHelpers.hpp
+++ b/vmime/parserHelpers.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/plainTextPart.hpp b/vmime/plainTextPart.hpp
index bb0322c8..fd5b3e02 100644
--- a/vmime/plainTextPart.hpp
+++ b/vmime/plainTextPart.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/platformDependant.hpp b/vmime/platformDependant.hpp
index a4fead32..673ff5ef 100644
--- a/vmime/platformDependant.hpp
+++ b/vmime/platformDependant.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/platforms/posix/posixFile.hpp b/vmime/platforms/posix/posixFile.hpp
index 892f8b17..e64f8d70 100644
--- a/vmime/platforms/posix/posixFile.hpp
+++ b/vmime/platforms/posix/posixFile.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/platforms/posix/posixHandler.hpp b/vmime/platforms/posix/posixHandler.hpp
index 7996d11d..ff4b7e97 100644
--- a/vmime/platforms/posix/posixHandler.hpp
+++ b/vmime/platforms/posix/posixHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/platforms/posix/posixSocket.hpp b/vmime/platforms/posix/posixSocket.hpp
index 13b70a53..99e12940 100644
--- a/vmime/platforms/posix/posixSocket.hpp
+++ b/vmime/platforms/posix/posixSocket.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/propertySet.hpp b/vmime/propertySet.hpp
index bfde4729..7ca37dde 100644
--- a/vmime/propertySet.hpp
+++ b/vmime/propertySet.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/relay.hpp b/vmime/relay.hpp
index 742d8487..c97db613 100644
--- a/vmime/relay.hpp
+++ b/vmime/relay.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/standardFields.hpp b/vmime/standardFields.hpp
index 850c3b99..f75b77d8 100644
--- a/vmime/standardFields.hpp
+++ b/vmime/standardFields.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
@@ -49,17 +49,39 @@ namespace vmime
 				  genericField <valueTypeClassName>() { /* Not used */ } \
 	}
 
-#define DECLARE_STANDARD_FIELD_PARAM(fieldClassName, valueTypeClassName) \
-	class fieldClassName : public genericField <valueTypeClassName>, \
-	                       public parameterizedHeaderField { \
-		friend class headerFieldFactory::registerer <fieldClassName>; \
-		protected: \
-			fieldClassName() { } \
-			fieldClassName(const fieldClassName&) \
-				: headerField(), \
-				  genericField <valueTypeClassName>(), \
-				  parameterizedHeaderField() { /* Not used */ } \
-	}
+#ifdef VMIME_NO_MULTIPLE_INHERITANCE
+
+	template <class TYPE>
+	class genericParameterizedHeaderField : public genericField <TYPE>
+	{
+	};
+
+	#define DECLARE_STANDARD_FIELD_PARAM(fieldClassName, valueTypeClassName) \
+		class fieldClassName : public genericParameterizedHeaderField <valueTypeClassName> { \
+			friend class headerFieldFactory::registerer <fieldClassName>; \
+			protected: \
+				fieldClassName() { } \
+				fieldClassName(const fieldClassName&) \
+					: headerField(), \
+					  genericParameterizedHeaderField <valueTypeClassName>() { /* Not used */ } \
+		}
+
+#else // VMIME_NO_MULTIPLE_INHERITANCE
+
+	#define DECLARE_STANDARD_FIELD_PARAM(fieldClassName, valueTypeClassName) \
+		class fieldClassName : public genericField <valueTypeClassName>, \
+		                       public parameterizedHeaderField { \
+			friend class headerFieldFactory::registerer <fieldClassName>; \
+			protected: \
+				fieldClassName() { } \
+				fieldClassName(const fieldClassName&) \
+					: headerField(), \
+					  genericField <valueTypeClassName>(), \
+					  parameterizedHeaderField() { /* Not used */ } \
+		}
+
+#endif // VMIME_NO_MULTIPLE_INHERITANCE
+
 
 
 DECLARE_STANDARD_FIELD(addressListField, addressList);
diff --git a/vmime/standardParams.hpp b/vmime/standardParams.hpp
index 8623301c..62f5774c 100644
--- a/vmime/standardParams.hpp
+++ b/vmime/standardParams.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/streamContentHandler.hpp b/vmime/streamContentHandler.hpp
index 34f66d39..15ae280f 100644
--- a/vmime/streamContentHandler.hpp
+++ b/vmime/streamContentHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/stringContentHandler.hpp b/vmime/stringContentHandler.hpp
index f859c1bb..1d75ceba 100644
--- a/vmime/stringContentHandler.hpp
+++ b/vmime/stringContentHandler.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/text.hpp b/vmime/text.hpp
index 4af9c495..0f42b982 100644
--- a/vmime/text.hpp
+++ b/vmime/text.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/textPart.hpp b/vmime/textPart.hpp
index dcfa38fe..5186592a 100644
--- a/vmime/textPart.hpp
+++ b/vmime/textPart.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/textPartFactory.hpp b/vmime/textPartFactory.hpp
index 39159bc2..d117edb8 100644
--- a/vmime/textPartFactory.hpp
+++ b/vmime/textPartFactory.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/typeAdapter.hpp b/vmime/typeAdapter.hpp
index 3fed9383..b1229f35 100644
--- a/vmime/typeAdapter.hpp
+++ b/vmime/typeAdapter.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/types.hpp b/vmime/types.hpp
index bd5568d2..9a2d7f19 100644
--- a/vmime/types.hpp
+++ b/vmime/types.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/datetimeUtils.hpp b/vmime/utility/datetimeUtils.hpp
index 93bab55e..afa91407 100644
--- a/vmime/utility/datetimeUtils.hpp
+++ b/vmime/utility/datetimeUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/file.hpp b/vmime/utility/file.hpp
index 6590c217..89fbeebe 100644
--- a/vmime/utility/file.hpp
+++ b/vmime/utility/file.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/md5.hpp b/vmime/utility/md5.hpp
index b52fc460..eaded4c9 100644
--- a/vmime/utility/md5.hpp
+++ b/vmime/utility/md5.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/path.hpp b/vmime/utility/path.hpp
index fa83a625..06d1403f 100644
--- a/vmime/utility/path.hpp
+++ b/vmime/utility/path.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/random.hpp b/vmime/utility/random.hpp
index ded52309..9e56546d 100644
--- a/vmime/utility/random.hpp
+++ b/vmime/utility/random.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/smartPtr.hpp b/vmime/utility/smartPtr.hpp
index 4fdad5de..196b2807 100644
--- a/vmime/utility/smartPtr.hpp
+++ b/vmime/utility/smartPtr.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/stream.hpp b/vmime/utility/stream.hpp
index 108a384e..5875a1f1 100644
--- a/vmime/utility/stream.hpp
+++ b/vmime/utility/stream.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/stringProxy.hpp b/vmime/utility/stringProxy.hpp
index 1a15a04d..614468f1 100644
--- a/vmime/utility/stringProxy.hpp
+++ b/vmime/utility/stringProxy.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/utility/stringUtils.hpp b/vmime/utility/stringUtils.hpp
index 264c4eb9..8dce55b2 100644
--- a/vmime/utility/stringUtils.hpp
+++ b/vmime/utility/stringUtils.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/vmime.hpp b/vmime/vmime.hpp
index 910eea9c..079980f3 100644
--- a/vmime/vmime.hpp
+++ b/vmime/vmime.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/vmime/word.hpp b/vmime/word.hpp
index b0a9a035..6b180173 100644
--- a/vmime/word.hpp
+++ b/vmime/word.hpp
@@ -1,5 +1,5 @@
 //
-// VMime library (http://vmime.sourceforge.net)
+// VMime library (http://www.vmime.org)
 // Copyright (C) 2002-2005 Vincent Richard <[email protected]>
 //
 // This program is free software; you can redistribute it and/or