Updated FSF address.

examples/example1.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/example2.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/example3.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/example4.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/example5.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/example6.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include <iostream>

examples/example7.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

examples/viewer/viewer.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 //

src/address.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/address.hpp"

src/addressList.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/addressList.hpp"

src/base.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/config.hpp"

src/body.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/bodyPart.hpp"

src/bodyPart.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/bodyPart.hpp"

src/charset.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/charset.hpp"

src/component.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/component.hpp"

src/constants.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/constants.hpp"

src/contentDisposition.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/contentDisposition.hpp"

src/contentDispositionField.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/contentDispositionField.hpp"

src/contentHandler.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/contentHandler.hpp"

src/contentTypeField.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/contentTypeField.hpp"

src/dateTime.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include <iomanip>

src/defaultAttachment.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/defaultAttachment.hpp"

src/defaultParameter.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/defaultParameter.hpp"

src/disposition.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/disposition.hpp"

src/emptyContentHandler.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/emptyContentHandler.hpp"

src/encoder.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoder.hpp"

src/encoder7bit.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoder7bit.hpp"

src/encoder8bit.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoder8bit.hpp"

src/encoderB64.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderB64.hpp"

src/encoderBinary.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderBinary.hpp"

src/encoderDefault.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderDefault.hpp"

src/encoderFactory.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderFactory.hpp"

src/encoderQP.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderQP.hpp"

src/encoderUUE.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoderUUE.hpp"

src/encoding.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/encoding.hpp"

src/exception.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/exception.hpp"

src/fileAttachment.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include <fstream>

src/header.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/header.hpp"

src/headerField.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/headerField.hpp"

src/headerFieldFactory.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/headerFieldFactory.hpp"

src/htmlTextPart.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/htmlTextPart.hpp"

src/mailbox.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/mailbox.hpp"

src/mailboxField.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/mailboxField.hpp"

src/mailboxGroup.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/mailboxGroup.hpp"

src/mailboxList.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/mailboxList.hpp"

src/mdn/MDNHelper.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/mdn/MDNHelper.hpp"

src/mdn/MDNInfos.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/mdn/MDNInfos.hpp"

src/mdn/receivedMDNInfos.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/mdn/receivedMDNInfos.hpp"

src/mdn/sendableMDNInfos.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/mdn/sendableMDNInfos.hpp"

src/mediaType.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/mediaType.hpp"

src/message.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/message.hpp"

src/messageBuilder.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/messageBuilder.hpp"

src/messageId.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/messageId.hpp"

src/messageIdSequence.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/messageIdSequence.hpp"

src/messageParser.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/messageParser.hpp"

src/misc/importanceHelper.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/misc/importanceHelper.hpp"

src/net/authHelper.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/authHelper.hpp"

src/net/builtinServices.inl

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #ifndef VMIME_BUILDING_DOC

src/net/events.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/events.hpp"

src/net/folder.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/folder.hpp"

src/net/imap/IMAPConnection.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPTag.hpp"

src/net/imap/IMAPFolder.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPFolder.hpp"

src/net/imap/IMAPMessage.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPParser.hpp"

src/net/imap/IMAPStore.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPStore.hpp"

src/net/imap/IMAPTag.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPTag.hpp"

src/net/imap/IMAPUtils.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/imap/IMAPUtils.hpp"

src/net/maildir/maildirFolder.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/maildir/maildirFolder.hpp"

src/net/maildir/maildirMessage.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/maildir/maildirMessage.hpp"

src/net/maildir/maildirStore.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/maildir/maildirStore.hpp"

src/net/maildir/maildirUtils.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/maildir/maildirUtils.hpp"

src/net/message.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/message.hpp"

src/net/pop3/POP3Folder.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/pop3/POP3Folder.hpp"

src/net/pop3/POP3Message.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/pop3/POP3Message.hpp"

src/net/pop3/POP3Store.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/pop3/POP3Store.hpp"

src/net/sendmail/sendmailTransport.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/sendmail/sendmailTransport.hpp"

src/net/service.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/config.hpp"

src/net/serviceFactory.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/serviceFactory.hpp"

src/net/serviceInfos.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/serviceInfos.hpp"

src/net/session.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/session.hpp"

src/net/smtp/SMTPTransport.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/smtp/SMTPTransport.hpp"

src/net/transport.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/net/transport.hpp"

src/object.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/types.hpp"

src/options.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/options.hpp"

src/parameter.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/parameter.hpp"

src/parameterFactory.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/parameterFactory.hpp"

src/parameterizedHeaderField.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/parameterizedHeaderField.hpp"

src/path.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/path.hpp"

src/plainTextPart.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/plainTextPart.hpp"

src/platformDependant.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/platformDependant.hpp"

src/platforms/posix/posixChildProcess.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/platforms/posix/posixChildProcess.hpp"

src/platforms/posix/posixFile.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/platforms/posix/posixFile.hpp"

src/platforms/posix/posixHandler.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/platforms/posix/posixHandler.hpp"

src/platforms/posix/posixSocket.cpp

@@ -12,9 +12,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc., Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //
 
 #include "vmime/platforms/posix/posixSocket.hpp"

src/platforms/windows/windowsFile.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/platforms/windows/windowsFile.hpp"

src/platforms/windows/windowsHandler.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/platforms/windows/windowsHandler.hpp"

src/platforms/windows/windowsSocket.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #pragma warning(disable: 4267)

src/propertySet.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/propertySet.hpp"

src/relay.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/relay.hpp"

src/security/defaultAuthenticator.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 
 #include "vmime/security/defaultAuthenticator.hpp"

src/security/digest/md5/md5MessageDigest.cpp

@@ -12,9 +12,13 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
+// You should have received a copy of the GNU General Public License along
-// along with this program; if not, write to the Free Software
+// with this program; if not, write to the Free Software Foundation, Inc.,
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
 //
 //
 // Derived from cryptoapi implementation, originally based on the