diff --git a/INSTALL b/INSTALL
index 25e222220..7c792888a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation
 ============
 
-This program requires GTK+ 3.20 or higher to be compiled.
+This program requires GTK 3.20 or higher to be compiled.
 
 Build it
 ========
@@ -58,7 +58,7 @@ GnuPG (>= 1.2.1) and GPGME (>=  0.4.5)
 GnuTLS (>= 0.4.2)
     for SSL support
     https://gnutls.org/
-GTK+ WebKit (>= 2.0)
+GTK WebKit (>= 2.0)
     for Fancy plugin support
     https://trac.webkit.org/wiki/WebKitGTK/
 Gs tool
diff --git a/README b/README
index 977d0e713..11e167463 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Claws Mail - a GTK+ lightweight and fast e-mail client
+Claws Mail - a GTK lightweight and fast e-mail client
 
 ---------------------------------------------------------------------
 
@@ -43,7 +43,7 @@ Summary:
 --------------------------
 
 Claws Mail is a lightweight and highly configurable email client
-and news reader based on the GTK+ GUI toolkit, it runs on the X
+and news reader based on the GTK GUI toolkit, it runs on the X
 Window System.
 
 Claws Mail is free software distributed under the GNU GPL.
@@ -130,9 +130,9 @@ All plugin preferences can be found under
 
   o Fancy
     Renders HTML mails and HTML parts of multipart messages using the
-    GTK+ port of the WebKit library. External content is blocked by
+    GTK port of the WebKit library. External content is blocked by
     default (including images) to avoid remote tracking, but can be
-    enabled either globally or just on the displayed message. The GTK+
+    enabled either globally or just on the displayed message. The GTK
     WebKit is available from http://trac.webkit.org/wiki/WebKitGTK/.
 
   o Fetchinfo
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 04800e226..7b3a1b2b5 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,15 +1,15 @@
 10th July 2021                                       Claws Mail 4.0.0
 
-		    CLAWS MAIL  RELEASE NOTES
+                    CLAWS MAIL  RELEASE NOTES
                     http://www.claws-mail.org
 
-Claws Mail is a GTK+ based, user-friendly, lightweight, and fast 
+Claws Mail is a GTK based, user-friendly, lightweight, and fast
 email client.
 
 Notes for this release:
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-If you are upgrading from the GTK+ 2 version of Claws Mail, you will
+If you are upgrading from the GTK 2 version of Claws Mail, you will
 need to reload any plugins that you want to use.
 
 New in this release:
diff --git a/claws-mail.desktop b/claws-mail.desktop
index 75f20bb33..6e3adf718 100644
--- a/claws-mail.desktop
+++ b/claws-mail.desktop
@@ -23,24 +23,24 @@ Exec=claws-mail %u
 Icon=claws-mail
 Categories=Network;Email;
 Keywords=lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;
-Comment=Lightweight and Fast GTK+ based Mail Client
-Comment[ca]=Client de correu electrònic ràpid i lleuger basat en GTK+
-Comment[cs]=Lehký a rychlý mailový klient založený na GTK+
-Comment[da]=Letvægts og hurtig GTK+ baseret e-post klient
-Comment[es]=Cliente de correo rápido y ligero basado en GTK+
-Comment[fi]=Kevyt ja nopea GTK+-pohjainen sähköpostiohjelma
-Comment[fr]=Client de messagerie électronique, rapide et léger, en GTK+
-Comment[he]=לקוח דואר קל משקל ומהיר מבוסס +GTK
-Comment[hu]=Pehelysúlyú és gyors GTK+ alapú levelezőkliens
-Comment[id]=Pembaca e-mail berbasis GTK+ yang cepat dan ringan
-Comment[ja]=軽量で早いGTK+ベースのEメールクライアント
-Comment[lt]=Lengvas ir greitas el. pašto klientas GTK+ pagrindu
-Comment[pl]=Program pocztowy używający GTK+
-Comment[pt]=Cliente de e-mail leve e rápido, baseado em GTK+
-Comment[ru]=Быстрый почтовый клиент на базе GTK+
-Comment[sk]=Odľahčený a rýchly poštový klient, založený na GTK+
-Comment[sv]=Lättviktig och snabb GTK+-baserad E-postklient
-Comment[tr]=GTK+ temelli hafif ve hızlı bir E-posta İstemcisi
+Comment=Lightweight and Fast GTK based Mail Client
+Comment[ca]=Client de correu electrònic ràpid i lleuger basat en GTK
+Comment[cs]=Lehký a rychlý mailový klient založený na GTK
+Comment[da]=Letvægts og hurtig GTK baseret e-post klient
+Comment[es]=Cliente de correo rápido y ligero basado en GTK
+Comment[fi]=Kevyt ja nopea GTK-pohjainen sähköpostiohjelma
+Comment[fr]=Client de messagerie électronique, rapide et léger, en GTK
+Comment[he]=לקוח דואר קל משקל ומהיר מבוסס GTK
+Comment[hu]=Pehelysúlyú és gyors GTK alapú levelezőkliens
+Comment[id]=Pembaca e-mail berbasis GTK yang cepat dan ringan
+Comment[ja]=軽量で早いGTKベースのEメールクライアント
+Comment[lt]=Lengvas ir greitas el. pašto klientas GTK pagrindu
+Comment[pl]=Program pocztowy używający GTK
+Comment[pt]=Cliente de e-mail leve e rápido, baseado em GTK
+Comment[ru]=Быстрый почтовый клиент на базе GTK
+Comment[sk]=Odľahčený a rýchly poštový klient, založený na GTK
+Comment[sv]=Lättviktig och snabb GTK-baserad E-postklient
+Comment[tr]=GTK temelli hafif ve hızlı bir E-posta İstemcisi
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
index a0d55c38f..70f484804 100644
--- a/doc/man/claws-mail.1
+++ b/doc/man/claws-mail.1
@@ -1,8 +1,8 @@
-.TH "CLAWS MAIL" "1" "January 16, 2021" "The Claws Mail team" "User Manuals"
+.TH "CLAWS MAIL" "1" "March 17, 2022" "The Claws Mail team" "User Manuals"
 
 .SH "NAME"
 .LP
-Claws Mail \- a GTK+ based fast email and news client
+Claws Mail \- a GTK based fast email and news client
 
 .SH "SYNOPSIS"
 .B claws\-mail
@@ -10,7 +10,7 @@ Claws Mail \- a GTK+ based fast email and news client
 
 .SH "DESCRIPTION"
 .TP
-Claws Mail is an email client (and news reader) based on GTK+, running on the X Window System, and aiming for:
+Claws Mail is an email client (and news reader) based on GTK, running on the X Window System, and aiming for:
 .br
 \[bu] Quick response
 .br
@@ -227,7 +227,7 @@ All folders' attributes.
 Folder hierarchy listing.
 .TP
 \fB$HOME/.claws\-mail/gtkrc-2.0\fR
-Optional GTK+ settings to be load on startup.
+Optional GTK settings to be load on startup.
 .TP
 \fB$HOME/.claws\-mail/matcherrc\fR
 Filtering and Processing function configuration.
@@ -261,7 +261,7 @@ Claws Mail output file when \-\-debug is enabled. If
 %TEMP% is not set it defaults to windows directory (usually
 C:\\Windows) or C:\\ if windows directory is not available.
 .TP
-\fB %APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
+\fB%APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
 Claws Mail log file.
 
 .SH "EXAMPLES"
@@ -459,7 +459,7 @@ You can search for existing bugs and report new ones on Claws Mail bugzilla:
 .SH "COPYRIGHT"
 .LP
 .TP
-1999\-2021 The Claws Mail team and Hiroyuki Yamamoto
+1999\-2022 The Claws Mail team and Hiroyuki Yamamoto
 .LP
 Portions are also Copyright:
 .br
diff --git a/manual/en/plugins.xml b/manual/en/plugins.xml
index 9037d2868..277d0f222 100644
--- a/manual/en/plugins.xml
+++ b/manual/en/plugins.xml
@@ -136,7 +136,7 @@
 	<term>Fancy</term>
 	<listitem>
 	  <para>
-	Enables the rendering of HTML messages using the GTK+ port of the
+	Enables the rendering of HTML messages using the GTK port of the
 	WebKit library. By default, no remote content is loaded.
 	  </para><para>
 	Plugin preferences can be found in 
diff --git a/manual/es/plugins.xml b/manual/es/plugins.xml
index 924ba4bf8..15dbf1888 100644
--- a/manual/es/plugins.xml
+++ b/manual/es/plugins.xml
@@ -143,7 +143,7 @@
         <term>Visor HTML Fancy</term>
         <listitem>
           <para>
-	Permite mostrar mensajes HTML usando la versión basada en GTK+
+	Permite mostrar mensajes HTML usando la versión basada en GTK
 	de la librería WebKit. Por omisión no se carga ningún contenido
 	remoto.
 	  </para><para>
diff --git a/po/bg.po b/po/bg.po
index ffefd7b65..63bdfb02c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3885,33 +3885,33 @@ msgstr ""
 #: src/gtk/about.c:167
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локал: %s (кодова таблица: %s)\n"
 "Операционна система: %s %s (%s)"
 
 #: src/gtk/about.c:176
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локал: %s (кодова таблица: %s)\n"
 "Операционна система: %s"
 
 #: src/gtk/about.c:185
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локал: %s (кодова таблица: %s)\n"
 "Операционна система: непозната"
 
diff --git a/po/el.po b/po/el.po
index f8e8774ea..b0c264f3d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -43,7 +43,7 @@ msgid "E-mail client"
 msgstr ""
 
 #: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+msgid "Lightweight and Fast GTK based Mail Client"
 msgstr ""
 
 #: ../src/account.c:392
@@ -4302,33 +4302,33 @@ msgstr "Πληροφορίες"
 #: ../src/gtk/about.c:168
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Ρύθμιση τοπικότητας: %s (σύνολο χαρακτήρων: %s)\n"
 "Λειτουργικό σύστημα: %s %s (%s)"
 
 #: ../src/gtk/about.c:177
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Ρύθμιση τοπικότητας: %s (σύνολο χαρακτήρων: %s)\n"
 "Λειτουργικό σύστημα: %s"
 
 #: ../src/gtk/about.c:186
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Ρύθμιση τοπικότητας: %s (σύνολο χαρακτήρων: %s)\n"
 "Λειτουργικό σύστημα: άγνωστο"
 
diff --git a/po/eo.po b/po/eo.po
index 3448aa911..49759d45d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4024,33 +4024,33 @@ msgstr ""
 #: src/gtk/about.c:167
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Lokiĝo: %s (signaro: %s)\n"
 "Operaciumo: %s %s (%s)"
 
 #: src/gtk/about.c:176
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Lokiĝo: %s (signaro: %s)\n"
 "Operaciumo: %s"
 
 #: src/gtk/about.c:185
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Lokiĝo: %s (signaro: %s)\n"
 "Operaciumo: nekonata"
 
diff --git a/po/fi.po b/po/fi.po
index 48161e20b..2b9815a88 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1070,7 +1070,7 @@ msgstr "Tämä moduuli ei ole GPL v3 tai myöhempi -yhteensopivasti lisensoitu."
 
 #: src/common/plugin.c:491
 msgid "This module is for Claws Mail GTK1."
-msgstr "Tämä moduuli on Claws Mailin GTK+1-versiolle."
+msgstr "Tämä moduuli on Claws Mailin GTK1-versiolle."
 
 #: src/common/plugin.c:769
 #, c-format
diff --git a/po/he.po b/po/he.po
index 6260015d8..a16cb414f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -294,7 +294,7 @@ msgstr ""
 "האם אתה בטוח כי ברצונך להחליף את כל שמות האפיון\n"
 "עם המערך השגרתי?"
 
-# CM (and GTK+ are) is running on Win too
+# CM (and GTK are) is running on Win too
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
 #: src/addressbook.c:483 src/edittags.c:272
 #: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
diff --git a/po/hr.po b/po/hr.po
index 7f3729686..cd9cd0715 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -42,7 +42,7 @@ msgid "E-mail client"
 msgstr ""
 
 #: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+msgid "Lightweight and Fast GTK based Mail Client"
 msgstr ""
 
 #: ../src/account.c:392
@@ -4342,31 +4342,31 @@ msgstr "Informacije"
 #: ../src/gtk/about.c:168
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ verzija %d.%d.%d\n"
+"GTK verzija %d.%d.%d\n"
 "Operativni sustav: %s %s (%s)"
 
 #: ../src/gtk/about.c:177
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ verzija %d.%d.%d\n"
+"GTK verzija %d.%d.%d\n"
 "Operativni sustav: %s %s (%s)"
 
 #: ../src/gtk/about.c:186
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ verzija %d.%d.%d\n"
+"GTK verzija %d.%d.%d\n"
 "Operativni sustav: %s %s (%s)"
 
 #: ../src/gtk/about.c:243 ../src/prefs_themes.c:730 ../src/wizard.c:527
diff --git a/po/ko.po b/po/ko.po
index 2eb52b34e..2375e9bbc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -43,7 +43,7 @@ msgid "E-mail client"
 msgstr ""
 
 #: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+msgid "Lightweight and Fast GTK based Mail Client"
 msgstr ""
 
 #: ../src/account.c:392
@@ -4291,31 +4291,31 @@ msgstr "정보"
 #: ../src/gtk/about.c:168
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "운영 체계: %s %s (%s)"
 
 #: ../src/gtk/about.c:177
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "운영 체계: %s"
 
 #: ../src/gtk/about.c:186
 #, fuzzy, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "운영 체계: 모름"
 
 #: ../src/gtk/about.c:243 ../src/prefs_themes.c:730 ../src/wizard.c:527
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ef6ff4c43..500568f0d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -4057,33 +4057,33 @@ msgstr ""
 #: src/gtk/about.c:167
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema Operativo: %s %s (%s)"
 
 #: src/gtk/about.c:176
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema Operativo: %s"
 
 #: src/gtk/about.c:185
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema Operativo: desconhecido"
 
diff --git a/po/sr.po b/po/sr.po
index b99665060..1c4fa6329 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -47,7 +47,7 @@ msgid "E-mail client"
 msgstr ""
 
 #: ../claws-mail.desktop.in.h:2
-msgid "Lightweight and Fast GTK+ based Mail Client"
+msgid "Lightweight and Fast GTK based Mail Client"
 msgstr ""
 
 #: ../src/account.c:392
@@ -4313,33 +4313,33 @@ msgstr ""
 #: ../src/gtk/about.c:168
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s %s (%s)"
 
 #: ../src/gtk/about.c:177
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s"
 
 #: ../src/gtk/about.c:186
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: непознат"
 
diff --git a/po/uk.po b/po/uk.po
index d18082036..9ccce94c9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4010,33 +4010,33 @@ msgstr ""
 #: src/gtk/about.c:167
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локаль: %s (кодування символів: %s)\n"
 "Операційна система: %s %s (%s)"
 
 #: src/gtk/about.c:176
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локаль: %s (кодування символів: %s)\n"
 "Операційна система: %s"
 
 #: src/gtk/about.c:185
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Локаль: %s (кодування символів: %s)\n"
 "Операційна система: невідомо"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51113952a..8e8bb346e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3961,33 +3961,33 @@ msgstr ""
 #: src/gtk/about.c:167
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
-"GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
+"GTK版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s %s (%s)"
 
 #: src/gtk/about.c:176
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
-"GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
+"GTK版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s"
 
 #: src/gtk/about.c:185
 #, c-format
 msgid ""
-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"GTK %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
-"GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
+"GTK版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "本地语言: %s (字符集: %s)\n"
 "操作系统: (未知)"
 
diff --git a/src/account.c b/src/account.c
index 7b6c0e690..0589f6cca 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/account.h b/src/account.h
index 3c25dd04b..d747337c1 100644
--- a/src/account.h
+++ b/src/account.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/action.c b/src/action.c
index 76d46b808..293a699ec 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/action.h b/src/action.h
index 14f436920..7f534df3e 100644
--- a/src/action.h
+++ b/src/action.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/adbookbase.h b/src/adbookbase.h
index 68f56e4bc..9a543361d 100644
--- a/src/adbookbase.h
+++ b/src/adbookbase.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addr_compl.c b/src/addr_compl.c
index b7f461637..4556a006b 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  *
  * Copyright (C) 2000-2021 the Claws Mail team and Alfons Hoogervorst
  *
diff --git a/src/addr_compl.h b/src/addr_compl.h
index bd1ed788c..a056db6fa 100644
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * 
  * Copyright (C) 2000-2012 by Alfons Hoogervorst & The Claws Mail Team.
  *
diff --git a/src/addrbook.c b/src/addrbook.c
index 7f31ed55d..ad2370800 100644
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrbook.h b/src/addrbook.h
index 863a8b0a2..d536a9988 100644
--- a/src/addrbook.h
+++ b/src/addrbook.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright 		(C) 2001 Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrcache.c b/src/addrcache.c
index 918e226b8..d8049feea 100644
--- a/src/addrcache.c
+++ b/src/addrcache.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrcache.h b/src/addrcache.h
index 33dc2e1ee..c6be90b27 100644
--- a/src/addrcache.h
+++ b/src/addrcache.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrclip.c b/src/addrclip.c
index b41603942..c81c04795 100644
--- a/src/addrclip.c
+++ b/src/addrclip.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrclip.h b/src/addrclip.h
index 01733c67e..10f960efe 100644
--- a/src/addrclip.h
+++ b/src/addrclip.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 030c52875..db465683d 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2022 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrcustomattr.h b/src/addrcustomattr.h
index 41d87b671..243fe66d8 100644
--- a/src/addrcustomattr.h
+++ b/src/addrcustomattr.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2012 The Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrdefs.h b/src/addrdefs.h
index 2ee8fd88e..6cb492d68 100644
--- a/src/addrdefs.h
+++ b/src/addrdefs.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index e68c58e17..aaf7e0117 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2022 Holger Berndt <hb@claws-mail.org>
  * and the Claws Mail team
  *
diff --git a/src/addrduplicates.h b/src/addrduplicates.h
index 9d9344fe6..5ca16a4c2 100644
--- a/src/addrduplicates.h
+++ b/src/addrduplicates.h
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2012 Holger Berndt <hb@claws-mail.org> 
  * and the Claws Mail team
  *
diff --git a/src/addressadd.c b/src/addressadd.c
index 305c2d670..99357110a 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressadd.h b/src/addressadd.h
index aa659891e..1846b6a9c 100644
--- a/src/addressadd.h
+++ b/src/addressadd.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressbook.c b/src/addressbook.c
index b1c02859e..a1e0bbc98 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressbook.h b/src/addressbook.h
index beb92cdf8..c2d9f0a25 100644
--- a/src/addressbook.h
+++ b/src/addressbook.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 4b060ec4c..dfea3a105 100644
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressbook_foldersel.h b/src/addressbook_foldersel.h
index 8936da503..2505e9a23 100644
--- a/src/addressbook_foldersel.h
+++ b/src/addressbook_foldersel.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addressitem.h b/src/addressitem.h
index a41f2826e..6ec032b32 100644
--- a/src/addressitem.h
+++ b/src/addressitem.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrgather.c b/src/addrgather.c
index 22f01a327..e9d876d60 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrgather.h b/src/addrgather.h
index 3eb5d0d10..09cdcaf60 100644
--- a/src/addrgather.h
+++ b/src/addrgather.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrharvest.c b/src/addrharvest.c
index 5e6cbeb89..cb46a04d2 100644
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrharvest.h b/src/addrharvest.h
index eef262dc1..9fe2e67e8 100644
--- a/src/addrharvest.h
+++ b/src/addrharvest.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrindex.c b/src/addrindex.c
index 735a6a61d..9b66713b2 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrindex.h b/src/addrindex.h
index 2db902a90..25be5847d 100644
--- a/src/addrindex.h
+++ b/src/addrindex.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addritem.c b/src/addritem.c
index cfde57796..c2e8ead24 100644
--- a/src/addritem.c
+++ b/src/addritem.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2017 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addritem.h b/src/addritem.h
index 9bccdf8f2..926ebc75a 100644
--- a/src/addritem.h
+++ b/src/addritem.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2017 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrmerge.c b/src/addrmerge.c
index 71a699e36..b0688f0b7 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2019 Charles Lehner and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrmerge.h b/src/addrmerge.h
index 344d36113..2e712331a 100644
--- a/src/addrmerge.h
+++ b/src/addrmerge.h
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014 Charles Lehner and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrquery.c b/src/addrquery.c
index 730e491dc..921bc9fed 100644
--- a/src/addrquery.c
+++ b/src/addrquery.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrquery.h b/src/addrquery.h
index 3875306c5..1a1a0b13d 100644
--- a/src/addrquery.h
+++ b/src/addrquery.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrselect.c b/src/addrselect.c
index d4d516f9c..8f453799e 100644
--- a/src/addrselect.c
+++ b/src/addrselect.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/addrselect.h b/src/addrselect.h
index e08a3b333..632f44f6a 100644
--- a/src/addrselect.h
+++ b/src/addrselect.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/advsearch.c b/src/advsearch.c
index 85dc3cc2d..120a595fb 100644
--- a/src/advsearch.c
+++ b/src/advsearch.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2012-2014 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/advsearch.h b/src/advsearch.h
index bb6803234..2f66a88d4 100644
--- a/src/advsearch.h
+++ b/src/advsearch.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 8d96b8042..3ce085b47 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/alertpanel.h b/src/alertpanel.h
index 4d42936e9..8c631c941 100644
--- a/src/alertpanel.h
+++ b/src/alertpanel.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022  the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/autofaces.c b/src/autofaces.c
index 300435c30..130d5c320 100644
--- a/src/autofaces.c
+++ b/src/autofaces.c
@@ -1,6 +1,6 @@
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2008-2012 Ricardo Mones and the Claws Mail team
  * 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/autofaces.h b/src/autofaces.h
index 14c3ec038..5f03e1e9b 100644
--- a/src/autofaces.h
+++ b/src/autofaces.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2008-2012 Ricardo Mones and the Claws Mail team
  * 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/avatars.c b/src/avatars.c
index c39b1494c..8225efa72 100644
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2016 Ricardo Mones and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/avatars.h b/src/avatars.h
index c7ac1c91f..3b34acfa7 100644
--- a/src/avatars.h
+++ b/src/avatars.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014 Ricardo Mones and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/browseldap.c b/src/browseldap.c
index 933d82ee8..0ef5f3b64 100644
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2022 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/browseldap.h b/src/browseldap.h
index 7df9ceeee..c7d8ad81f 100644
--- a/src/browseldap.h
+++ b/src/browseldap.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/claws.c b/src/common/claws.c
index c46823bc5..3efdab4f9 100644
--- a/src/common/claws.c
+++ b/src/common/claws.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012  the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/claws.h b/src/common/claws.h
index 14cb4e7b3..31a9fb729 100644
--- a/src/common/claws.h
+++ b/src/common/claws.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999,2000 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/codeconv.c b/src/common/codeconv.c
index 1922f0096..2337b4e12 100644
--- a/src/common/codeconv.c
+++ b/src/common/codeconv.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/codeconv.h b/src/common/codeconv.h
index 61c3a06bd..8b080929d 100644
--- a/src/common/codeconv.h
+++ b/src/common/codeconv.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/defs.h b/src/common/defs.h
index c40ecb9a5..fa919b615 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index 569ffda15..5fc7e3e83 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/file-utils.h b/src/common/file-utils.h
index 14bd42360..13cfc69ac 100644
--- a/src/common/file-utils.h
+++ b/src/common/file-utils.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/hooks.c b/src/common/hooks.c
index 230fb7130..b374652c5 100644
--- a/src/common/hooks.c
+++ b/src/common/hooks.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/hooks.h b/src/common/hooks.h
index bbb4d3e34..f130a6b26 100644
--- a/src/common/hooks.h
+++ b/src/common/hooks.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/log.c b/src/common/log.c
index c06ffea63..a1b2e1f35 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/log.h b/src/common/log.h
index 64bd91ac0..e8866de26 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/mgutils.c b/src/common/mgutils.c
index e6fdf4d2d..503be7aa0 100644
--- a/src/common/mgutils.c
+++ b/src/common/mgutils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/mgutils.h b/src/common/mgutils.h
index 90c5d8051..dad640700 100644
--- a/src/common/mgutils.h
+++ b/src/common/mgutils.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c
index 5b3a1dbe8..73d1b5655 100644
--- a/src/common/passcrypt.c
+++ b/src/common/passcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/passcrypt.h.in b/src/common/passcrypt.h.in
index 1036d0e48..4118295aa 100644
--- a/src/common/passcrypt.h.in
+++ b/src/common/passcrypt.h.in
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/pkcs5_pbkdf2.h b/src/common/pkcs5_pbkdf2.h
index f10896d10..4430228e2 100644
--- a/src/common/pkcs5_pbkdf2.h
+++ b/src/common/pkcs5_pbkdf2.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 The Claws Mail Team
  *
  * pkcs5_pbkdf2.h - Password-Based Key Derivation Function 2
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 839958b8d..47557d735 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2022 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/plugin.h b/src/common/plugin.h
index cc7274620..6d3c4d468 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2015 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/prefs.c b/src/common/prefs.c
index 12df810a2..114ed65e5 100644
--- a/src/common/prefs.c
+++ b/src/common/prefs.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/prefs.h b/src/common/prefs.h
index aeb6dd901..3feddda7f 100644
--- a/src/common/prefs.h
+++ b/src/common/prefs.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/progressindicator.c b/src/common/progressindicator.c
index 1a848384e..066b2b680 100644
--- a/src/common/progressindicator.c
+++ b/src/common/progressindicator.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/progressindicator.h b/src/common/progressindicator.h
index 4275f6d12..e7b47d551 100644
--- a/src/common/progressindicator.h
+++ b/src/common/progressindicator.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/proxy.c b/src/common/proxy.c
index a09379449..6eb92ce98 100644
--- a/src/common/proxy.c
+++ b/src/common/proxy.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2018 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/proxy.h b/src/common/proxy.h
index 7551a5e66..0c78a0c8b 100644
--- a/src/common/proxy.h
+++ b/src/common/proxy.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2018 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index 0d265a119..ea223613b 100644
--- a/src/common/quoted-printable.c
+++ b/src/common/quoted-printable.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/quoted-printable.h b/src/common/quoted-printable.h
index 92f53b67f..6c0dc6516 100644
--- a/src/common/quoted-printable.h
+++ b/src/common/quoted-printable.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/session.c b/src/common/session.c
index b5b49dca8..51da1aced 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/session.h b/src/common/session.h
index f72270c88..4986303e1 100644
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/smtp.c b/src/common/smtp.c
index b0d91c0cc..7663c098d 100644
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/smtp.h b/src/common/smtp.h
index f20bf711c..07517735c 100644
--- a/src/common/smtp.h
+++ b/src/common/smtp.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/socket.c b/src/common/socket.c
index 33dd65cd6..3fd79d354 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/socket.h b/src/common/socket.h
index da547d9bc..629e067b8 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/ssl.c b/src/common/ssl.c
index f1beb6b6a..1eafe3f6e 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/ssl.h b/src/common/ssl.h
index 625976b3d..82df6794f 100644
--- a/src/common/ssl.h
+++ b/src/common/ssl.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index dc61960a7..c82a3584b 100644
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h
index 70894725d..f853a3fc5 100644
--- a/src/common/ssl_certificate.h
+++ b/src/common/ssl_certificate.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/common/string_match.c b/src/common/string_match.c
index b9b7a1531..93f2d37e8 100644
--- a/src/common/string_match.c
+++ b/src/common/string_match.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- regexp pattern matching utilities
+ * Claws Mail -- regexp pattern matching utilities
  * Copyright (C) 2001 Thomas Link, Hiroyuki Yamamoto
  *                    Modified by Melvin Hadasht.
  *
diff --git a/src/common/string_match.h b/src/common/string_match.h
index f3cad8568..0f1b8d830 100644
--- a/src/common/string_match.h
+++ b/src/common/string_match.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- regexp pattern matching utilities
+ * Claws Mail -- regexp pattern matching utilities
  * Copyright (C) 2001 Thomas Link, Hiroyuki Yamamoto
  *                    Modified by Melvin Hadasht.
  *
diff --git a/src/common/stringtable.c b/src/common/stringtable.c
index 19890e737..5a4a3251b 100644
--- a/src/common/stringtable.c
+++ b/src/common/stringtable.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/stringtable.h b/src/common/stringtable.h
index c3f5a4546..2612e1d64 100644
--- a/src/common/stringtable.h
+++ b/src/common/stringtable.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a gtk+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a gtk+ based, lightweight, and fast e-mail client
  * Copyright (c) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/tags.c b/src/common/tags.c
index 819d9d615..226f57030 100644
--- a/src/common/tags.c
+++ b/src/common/tags.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2012 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/tags.h b/src/common/tags.h
index 74cece77d..0729e9741 100644
--- a/src/common/tags.h
+++ b/src/common/tags.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2012 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/timing.h b/src/common/timing.h
index 9a0436e93..485b11c3f 100644
--- a/src/common/timing.h
+++ b/src/common/timing.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/unmime.c b/src/common/unmime.c
index 65d83ae51..81a6c6775 100644
--- a/src/common/unmime.c
+++ b/src/common/unmime.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/unmime.h b/src/common/unmime.h
index 3918b98d4..7009ab750 100644
--- a/src/common/unmime.h
+++ b/src/common/unmime.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/utils.c b/src/common/utils.c
index 17902c706..497bedfca 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 The Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/utils.h b/src/common/utils.h
index b1dfc5eae..43f68a2ac 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 The Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/uuencode.c b/src/common/uuencode.c
index 99af96148..6da83767e 100644
--- a/src/common/uuencode.c
+++ b/src/common/uuencode.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999,2000 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/uuencode.h b/src/common/uuencode.h
index a50605964..86b7a2321 100644
--- a/src/common/uuencode.h
+++ b/src/common/uuencode.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999,2000 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/version.h.in b/src/common/version.h.in
index 8b6a0e503..fda77c18a 100644
--- a/src/common/version.h.in
+++ b/src/common/version.h.in
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/w32_reg.c b/src/common/w32_reg.c
index 0cf3bbfc9..37ac1d984 100644
--- a/src/common/w32_reg.c
+++ b/src/common/w32_reg.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/w32_reg.h b/src/common/w32_reg.h
index a75ed43ed..3936e6c29 100644
--- a/src/common/w32_reg.h
+++ b/src/common/w32_reg.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/xml.c b/src/common/xml.c
index e9e6ec539..bb01699d5 100644
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/xml.h b/src/common/xml.h
index 6ca905937..1ecca4239 100644
--- a/src/common/xml.h
+++ b/src/common/xml.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/xmlprops.c b/src/common/xmlprops.c
index 0557bd27d..4a3e1668a 100644
--- a/src/common/xmlprops.c
+++ b/src/common/xmlprops.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/common/xmlprops.h b/src/common/xmlprops.h
index b14a8d28f..b987803d4 100644
--- a/src/common/xmlprops.h
+++ b/src/common/xmlprops.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/compose.c b/src/compose.c
index 717bab642..cdd32937b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
@@ -6861,14 +6861,14 @@ static gchar *compose_get_header(Compose *compose)
 	if (compose->account->gen_xmailer &&
 	    g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
 	    !compose->newsgroup_list) {
-		g_string_append_printf(header, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
+		g_string_append_printf(header, "X-Mailer: %s (GTK %d.%d.%d; %s)\n",
 			prog_version,
 			gtk_major_version, gtk_minor_version, gtk_micro_version,
 			TARGET_ALIAS);
 	}
 	if (compose->account->gen_xmailer &&
 	    g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
-		g_string_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
+		g_string_append_printf(header, "X-Newsreader: %s (GTK %d.%d.%d; %s)\n",
 			prog_version,
 			gtk_major_version, gtk_minor_version, gtk_micro_version,
 			TARGET_ALIAS);
diff --git a/src/compose.h b/src/compose.h
index 0da46906b..61f93f789 100644
--- a/src/compose.h
+++ b/src/compose.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/crash.c b/src/crash.c
index 2ecbcc63d..475f17928 100644
--- a/src/crash.c
+++ b/src/crash.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2019 by the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -226,7 +226,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
 
 	crash_report = g_strdup_printf(
 		"Claws Mail version %s\n"
-		"GTK+ version %d.%d.%d / GLib %d.%d.%d\n"
+		"GTK version %d.%d.%d / GLib %d.%d.%d\n"
 		"Locale: %s (charset: %s)\n"
 		"Features:%s\n"
 		"Operating system: %s\n"
@@ -533,7 +533,7 @@ static void crash_handler(int sig)
 		char *args[5];
 	
 		/*
-		 * probably also some other parameters (like GTK+ ones).
+		 * probably also some other parameters (like GTK ones).
 		 * also we pass the full startup dir and the real command
 		 * line typed in (argv0)
 		 */
diff --git a/src/crash.h b/src/crash.h
index 5e0ba934b..bdbb07f09 100644
--- a/src/crash.h
+++ b/src/crash.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 by the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/customheader.c b/src/customheader.c
index 554fb7d85..6521a5c19 100644
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/customheader.h b/src/customheader.h
index 1f7b1a4fb..90467c8ba 100644
--- a/src/customheader.h
+++ b/src/customheader.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/displayheader.c b/src/displayheader.c
index ad21256a1..a6b5d9af0 100644
--- a/src/displayheader.c
+++ b/src/displayheader.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/displayheader.h b/src/displayheader.h
index 7250a2482..7c973216f 100644
--- a/src/displayheader.h
+++ b/src/displayheader.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editaddress.c b/src/editaddress.c
index 25f96ffea..10114debe 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editaddress.h b/src/editaddress.h
index 9d2a13cac..48bb0c727 100644
--- a/src/editaddress.h
+++ b/src/editaddress.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
index 95b39dc44..0662b2f0a 100644
--- a/src/editaddress_other_attributes_ldap.c
+++ b/src/editaddress_other_attributes_ldap.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 Michael Rasmussen and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editaddress_other_attributes_ldap.h b/src/editaddress_other_attributes_ldap.h
index 86a4d0676..34bcda6a9 100644
--- a/src/editaddress_other_attributes_ldap.h
+++ b/src/editaddress_other_attributes_ldap.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Michael Rasmussen and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editbook.c b/src/editbook.c
index a3aa69a0a..565d0cf8d 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editbook.h b/src/editbook.h
index 35931e129..fa2e62b8d 100644
--- a/src/editbook.h
+++ b/src/editbook.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editgroup.c b/src/editgroup.c
index 09fbf1f82..04d89d1d2 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editgroup.h b/src/editgroup.h
index 7caf0b0a5..62556cf3d 100644
--- a/src/editgroup.h
+++ b/src/editgroup.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editjpilot.c b/src/editjpilot.c
index b0da08bfd..935586847 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editjpilot.h b/src/editjpilot.h
index 104c613bf..094cbd349 100644
--- a/src/editjpilot.h
+++ b/src/editjpilot.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editldap.c b/src/editldap.c
index baf82bcf1..c8ed4b438 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editldap.h b/src/editldap.h
index 7053b12fc..208449b39 100644
--- a/src/editldap.h
+++ b/src/editldap.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index b34c1a69d..d46f0e116 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editldap_basedn.h b/src/editldap_basedn.h
index 375c42054..25b034e48 100644
--- a/src/editldap_basedn.h
+++ b/src/editldap_basedn.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/edittags.c b/src/edittags.c
index 8d2db260d..ca1d8d116 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2022 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/edittags.h b/src/edittags.h
index e1e2e67a6..ab7f86c73 100644
--- a/src/edittags.h
+++ b/src/edittags.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editvcard.c b/src/editvcard.c
index 6e2949428..98cd82c12 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/editvcard.h b/src/editvcard.h
index f30a800cd..370e7daf5 100644
--- a/src/editvcard.h
+++ b/src/editvcard.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/enriched.c b/src/enriched.c
index c29affa97..d476b49a6 100644
--- a/src/enriched.c
+++ b/src/enriched.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999,2000 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/enriched.h b/src/enriched.h
index f3c726cd1..c0589ad66 100644
--- a/src/enriched.h
+++ b/src/enriched.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999,2000 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/entity.c b/src/entity.c
index 058c3aa3d..1c9098945 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2017 Ricardo Mones and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/entity.h b/src/entity.h
index 9e3e4929e..40294a17b 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2017 Ricardo Mones and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/etpan-errors.h b/src/etpan/etpan-errors.h
index 46ea7fe16..66987ea8a 100644
--- a/src/etpan/etpan-errors.h
+++ b/src/etpan/etpan-errors.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
index 2657ec31d..fbd8d2a19 100644
--- a/src/etpan/etpan-ssl.c
+++ b/src/etpan/etpan-ssl.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/etpan/etpan-ssl.h b/src/etpan/etpan-ssl.h
index 81da3d559..4605fdb76 100644
--- a/src/etpan/etpan-ssl.h
+++ b/src/etpan/etpan-ssl.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/etpan/etpan-thread-manager-types.h b/src/etpan/etpan-thread-manager-types.h
index a509205a9..264873ede 100644
--- a/src/etpan/etpan-thread-manager-types.h
+++ b/src/etpan/etpan-thread-manager-types.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/etpan-thread-manager.c b/src/etpan/etpan-thread-manager.c
index f73dbfe30..a84b33582 100644
--- a/src/etpan/etpan-thread-manager.c
+++ b/src/etpan/etpan-thread-manager.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/etpan-thread-manager.h b/src/etpan/etpan-thread-manager.h
index ff5ee4c49..802767692 100644
--- a/src/etpan/etpan-thread-manager.h
+++ b/src/etpan/etpan-thread-manager.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 0c4ad1dc2..a9a5453f9 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/imap-thread.h b/src/etpan/imap-thread.h
index e9826a062..e4287c272 100644
--- a/src/etpan/imap-thread.h
+++ b/src/etpan/imap-thread.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
index 5f5b31b59..65e794aa6 100644
--- a/src/etpan/nntp-thread.c
+++ b/src/etpan/nntp-thread.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/etpan/nntp-thread.h b/src/etpan/nntp-thread.h
index ddfb8ff53..b179cc35a 100644
--- a/src/etpan/nntp-thread.h
+++ b/src/etpan/nntp-thread.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
index 9feae9036..a089e21c9 100644
--- a/src/exphtmldlg.c
+++ b/src/exphtmldlg.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2022 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exphtmldlg.h b/src/exphtmldlg.h
index 466de20af..e70f6b208 100644
--- a/src/exphtmldlg.h
+++ b/src/exphtmldlg.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/expldifdlg.c b/src/expldifdlg.c
index 4b5609da3..b21008e40 100644
--- a/src/expldifdlg.c
+++ b/src/expldifdlg.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/expldifdlg.h b/src/expldifdlg.h
index efde28f2a..28418b697 100644
--- a/src/expldifdlg.h
+++ b/src/expldifdlg.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/export.c b/src/export.c
index 8e316e170..d4ef25280 100644
--- a/src/export.c
+++ b/src/export.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/export.h b/src/export.h
index 477ceff65..c56ef212b 100644
--- a/src/export.h
+++ b/src/export.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exporthtml.c b/src/exporthtml.c
index 7bc77533c..4a76b0dd0 100644
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exporthtml.h b/src/exporthtml.h
index b5f1b2d95..55eebc907 100644
--- a/src/exporthtml.h
+++ b/src/exporthtml.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exportldif.c b/src/exportldif.c
index c35d6de36..fb8f8b5a2 100644
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/exportldif.h b/src/exportldif.h
index f554b8be8..704d91d71 100644
--- a/src/exportldif.h
+++ b/src/exportldif.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/file_checker.c b/src/file_checker.c
index 7efd21083..aa197d220 100644
--- a/src/file_checker.c
+++ b/src/file_checker.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2013-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/file_checker.h b/src/file_checker.h
index 2e650bdbb..76da4d1b2 100644
--- a/src/file_checker.h
+++ b/src/file_checker.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2013-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/filtering.c b/src/filtering.c
index cf99d6be4..6ae94aa9d 100644
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/filtering.h b/src/filtering.h
index 7da85b940..d62928b47 100644
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folder.c b/src/folder.c
index 97c71390e..6651fc4e6 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folder.h b/src/folder.h
index 7013a7c33..454cae361 100644
--- a/src/folder.h
+++ b/src/folder.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 122b22409..c6fc6f024 100644
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index 8b72e1d0b..e9f6d099b 100644
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/foldersel.c b/src/foldersel.c
index ab740e34f..fa8905662 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/foldersel.h b/src/foldersel.h
index 4ab5b42fd..bfdbb8e08 100644
--- a/src/foldersel.h
+++ b/src/foldersel.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folderutils.c b/src/folderutils.c
index 4ff6133be..fd02001d9 100644
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folderutils.h b/src/folderutils.h
index 9394d44eb..a3d4ea34d 100644
--- a/src/folderutils.h
+++ b/src/folderutils.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folderview.c b/src/folderview.c
index a532e133c..a552ba090 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/folderview.h b/src/folderview.h
index 847d59b93..94a68d786 100644
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 54519b5c1..1d122fb0e 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/grouplistdialog.h b/src/grouplistdialog.h
index 8b4d137a1..c2c438643 100644
--- a/src/grouplistdialog.h
+++ b/src/grouplistdialog.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/about.c b/src/gtk/about.c
index 32a9ec486..c43c670d2 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
@@ -171,7 +171,7 @@ static GtkWidget *about_create_child_page_info(void)
 #if HAVE_SYS_UTSNAME_H
 	uname(&utsbuf);
 	format = g_strconcat(
-		       "GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		       "GTK %d.%d.%d / GLib %d.%d.%d\n",
 		     _("Locale: %s (charset: %s)\n"
 		     "Operating System: %s %s (%s)"), NULL);
 	g_snprintf(buf, sizeof(buf), format,
@@ -181,7 +181,7 @@ static GtkWidget *about_create_child_page_info(void)
 		   utsbuf.sysname, utsbuf.release, utsbuf.machine);
 #elif defined(G_OS_WIN32)
 	format = g_strconcat(
-		       "GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		       "GTK %d.%d.%d / GLib %d.%d.%d\n",
 		     _("Locale: %s (charset: %s)\n"
 		     "Operating System: %s"), NULL);
 	g_snprintf(buf, sizeof(buf), format,
@@ -191,7 +191,7 @@ static GtkWidget *about_create_child_page_info(void)
 		   "Win32");
 #else
 	format = g_strconcat(
-		       "GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		       "GTK %d.%d.%d / GLib %d.%d.%d\n",
 		     _("Locale: %s (charset: %s)\n"
 		     "Operating System: unknown"), NULL);
 	g_snprintf(buf, sizeof(buf), format,
diff --git a/src/gtk/about.h b/src/gtk/about.h
index 563a2d325..52ce93179 100644
--- a/src/gtk/about.h
+++ b/src/gtk/about.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 81515835d..661b97fc1 100644
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2018 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/colorlabel.h b/src/gtk/colorlabel.h
index cfbebf499..11656fd5f 100644
--- a/src/gtk/colorlabel.h
+++ b/src/gtk/colorlabel.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
index 151edae6f..4f9726029 100644
--- a/src/gtk/combobox.c
+++ b/src/gtk/combobox.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2012 Andrej Kacian and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/combobox.h b/src/gtk/combobox.h
index dbd98935c..39b57da17 100644
--- a/src/gtk/combobox.h
+++ b/src/gtk/combobox.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Andrej Kacian and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 8561f768d..6d932e515 100644
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/description_window.h b/src/gtk/description_window.h
index 7d43080b4..22ab01538 100644
--- a/src/gtk/description_window.h
+++ b/src/gtk/description_window.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index f8e36bcb1..ed71b5312 100644
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/filesel.h b/src/gtk/filesel.h
index ed3555b80..3a5aae684 100644
--- a/src/gtk/filesel.h
+++ b/src/gtk/filesel.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index 755193f1a..80eec42e6 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2022 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/foldersort.h b/src/gtk/foldersort.h
index 331bd1297..893a88e97 100644
--- a/src/gtk/foldersort.h
+++ b/src/gtk/foldersort.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2018 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 9744a21d4..027300d34 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Parts of this file:
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 8078a6959..65382b94f 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
@@ -884,7 +884,7 @@ GtkWidget *gtkut_get_focused_child(GtkContainer *parent)
 }
 
 /*!
- *\brief	Create a Browse (file) button based on GTK+ stock
+ *\brief	Create a Browse (file) button based on GTK stock
  */
 GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label)
 {
@@ -898,7 +898,7 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label)
 }
 
 /*!
- *\brief	Create a Browse (directory) button based on GTK+ stock
+ *\brief	Create a Browse (directory) button based on GTK stock
  */
 GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label)
 {
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index bfc60a703..4a53ab727 100644
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
 
 /* String used in color button labels.
  * Instead of hardcoding a size which doesn't look the same on different
- * resolutions, use a space;m-space;space label and let GTK+ to compute
+ * resolutions, use a space;m-space;space label and let GTK to compute
  * the appropriate button size for current font.
  * This macro is only used in gtkut_set_button_color(). */
 #define GTKUT_COLOR_BUTTON_LABEL "\x20\xE2\x80\x83\x20"
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index e267caba3..a61d8c851 100644
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/icon_legend.h b/src/gtk/icon_legend.h
index e1c06fd3d..98cb79697 100644
--- a/src/gtk/icon_legend.h
+++ b/src/gtk/icon_legend.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * This file Copyright (C) 2005-2012 Paul Mangan <paul@claws-mail.org>
  * and the Claws Mail team
  *
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index bc458e37e..83f28c4f8 100644
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/inputdialog.h b/src/gtk/inputdialog.h
index 426077254..382041238 100644
--- a/src/gtk/inputdialog.h
+++ b/src/gtk/inputdialog.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 6d3ea493e..43632cf3a 100644
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/logwindow.h b/src/gtk/logwindow.h
index 7c83b4a1d..f2809b99f 100644
--- a/src/gtk/logwindow.h
+++ b/src/gtk/logwindow.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/manage_window.c b/src/gtk/manage_window.c
index 68aede5a2..6dc8e1e72 100644
--- a/src/gtk/manage_window.c
+++ b/src/gtk/manage_window.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/manage_window.h b/src/gtk/manage_window.h
index 537a9dcf0..4835d76f2 100644
--- a/src/gtk/manage_window.h
+++ b/src/gtk/manage_window.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index ee187b85f..db3535b25 100644
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index 94b08c5b9..78c7fe44f 100644
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index d128eb5cb..413f14f12 100644
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/pluginwindow.h b/src/gtk/pluginwindow.h
index ea6e40fdc..b0a715411 100644
--- a/src/gtk/pluginwindow.h
+++ b/src/gtk/pluginwindow.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index ed13e2e7d..6fb84d6aa 100644
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index 8916e972a..3b8872705 100644
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index f96d8b35f..b5b638131 100644
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/progressdialog.h b/src/gtk/progressdialog.h
index 718409f15..cc120b77f 100644
--- a/src/gtk/progressdialog.h
+++ b/src/gtk/progressdialog.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index eb7c85727..0bd5d60ab 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index 9aada6e1f..a4d9079f0 100644
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 76e4a02e5..b71f6aedc 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/sslcertwindow.h b/src/gtk/sslcertwindow.h
index 772e7f73b..fa909c218 100644
--- a/src/gtk/sslcertwindow.h
+++ b/src/gtk/sslcertwindow.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/gtk/w32_filesel.c b/src/gtk/w32_filesel.c
index 6fd017f57..6ec6f570d 100644
--- a/src/gtk/w32_filesel.c
+++ b/src/gtk/w32_filesel.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 static OPENFILENAME o;
 static BROWSEINFO b;
 
-/* Since running the native dialogs in the same thread stops GTK+
+/* Since running the native dialogs in the same thread stops GTK
  * loop from redrawing other windows on the background, we need
  * to run the dialogs in a separate thread. */
 
diff --git a/src/headerview.c b/src/headerview.c
index 81e739c14..1feab7aee 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/headerview.h b/src/headerview.h
index f4e89da53..ee7171175 100644
--- a/src/headerview.h
+++ b/src/headerview.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/html.c b/src/html.c
index eb921c706..dc64cf4b8 100644
--- a/src/html.c
+++ b/src/html.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/html.h b/src/html.h
index 922389a23..31f6208fd 100644
--- a/src/html.h
+++ b/src/html.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 20672791d..3539ae9b9 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/image_viewer.h b/src/image_viewer.h
index 60ce1f2f1..b74c23d90 100644
--- a/src/image_viewer.h
+++ b/src/image_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/imap.c b/src/imap.c
index 3827986e6..06bd6495e 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/imap.h b/src/imap.h
index f100dcb6b..3870b1a86 100644
--- a/src/imap.h
+++ b/src/imap.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index b4e491634..773c46674 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/imap_gtk.h b/src/imap_gtk.h
index 59f00def7..acc1b1ae5 100644
--- a/src/imap_gtk.h
+++ b/src/imap_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/import.c b/src/import.c
index 0a1556527..1a250981e 100644
--- a/src/import.c
+++ b/src/import.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/import.h b/src/import.h
index bc99cdce4..5c43eeed8 100644
--- a/src/import.h
+++ b/src/import.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importldif.c b/src/importldif.c
index f436e489e..d179908c8 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importldif.h b/src/importldif.h
index e80c3ba98..6f5c47a21 100644
--- a/src/importldif.h
+++ b/src/importldif.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importmutt.c b/src/importmutt.c
index e8b02a339..796d0b28c 100644
--- a/src/importmutt.c
+++ b/src/importmutt.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importmutt.h b/src/importmutt.h
index d363d743a..a44e347c4 100644
--- a/src/importmutt.h
+++ b/src/importmutt.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importpine.c b/src/importpine.c
index 9d5dd1c43..8a4cd0635 100644
--- a/src/importpine.c
+++ b/src/importpine.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2022 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/importpine.h b/src/importpine.h
index eac2abfe0..1bb7f76d2 100644
--- a/src/importpine.h
+++ b/src/importpine.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/inc.c b/src/inc.c
index e50876f12..9971f8e4e 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/inc.h b/src/inc.h
index 13f10c1cb..bfa64dcea 100644
--- a/src/inc.h
+++ b/src/inc.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/jpilot.c b/src/jpilot.c
index 9923d766d..858cea245 100644
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/jpilot.h b/src/jpilot.h
index 3787d0cf0..4191d84be 100644
--- a/src/jpilot.h
+++ b/src/jpilot.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index 3bf8acecf..985dec4ed 100644
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2021 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapctrl.h b/src/ldapctrl.h
index 41673618b..adbd6a40a 100644
--- a/src/ldapctrl.h
+++ b/src/ldapctrl.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldaplocate.c b/src/ldaplocate.c
index 4e7762f2f..1dc3e7f54 100644
--- a/src/ldaplocate.c
+++ b/src/ldaplocate.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldaplocate.h b/src/ldaplocate.h
index 915ac3ecf..f571d2662 100644
--- a/src/ldaplocate.h
+++ b/src/ldaplocate.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapquery.c b/src/ldapquery.c
index f79959908..83070e9df 100644
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2018 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapquery.h b/src/ldapquery.h
index 46a757d93..cd453d8b4 100644
--- a/src/ldapquery.h
+++ b/src/ldapquery.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapserver.c b/src/ldapserver.c
index fec392cb3..f2eae85d0 100644
--- a/src/ldapserver.c
+++ b/src/ldapserver.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2021 the Claws Mail team and Match Grun
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapserver.h b/src/ldapserver.h
index 4b68eae42..999aab062 100644
--- a/src/ldapserver.h
+++ b/src/ldapserver.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapupdate.c b/src/ldapupdate.c
index d64884f0a..50bc547f9 100644
--- a/src/ldapupdate.c
+++ b/src/ldapupdate.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2018 Michael Rasmussen and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldapupdate.h b/src/ldapupdate.h
index d4df5c6af..097dab23f 100644
--- a/src/ldapupdate.h
+++ b/src/ldapupdate.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Michael Rasmussen and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldaputil.c b/src/ldaputil.c
index 310bfdc12..13b8a1278 100644
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2018 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldaputil.h b/src/ldaputil.h
index 0c711ca65..1ce419035 100644
--- a/src/ldaputil.h
+++ b/src/ldaputil.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldif.c b/src/ldif.c
index d2147d95e..249634be2 100644
--- a/src/ldif.c
+++ b/src/ldif.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ldif.h b/src/ldif.h
index 880d1433d..b5707a3b1 100644
--- a/src/ldif.h
+++ b/src/ldif.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/localfolder.c b/src/localfolder.c
index 7cce203bf..58621628a 100644
--- a/src/localfolder.c
+++ b/src/localfolder.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/localfolder.h b/src/localfolder.h
index fd1f41429..128dad5b7 100644
--- a/src/localfolder.h
+++ b/src/localfolder.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/main.c b/src/main.c
index f89043146..c9961cca2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
@@ -848,19 +848,19 @@ static void main_dump_features_list(gboolean show_debug_only)
 		return;
 
 	if (show_debug_only)
-		debug_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		debug_print("runtime GTK %d.%d.%d / GLib %d.%d.%d\n",
 			   gtk_major_version, gtk_minor_version, gtk_micro_version,
 			   glib_major_version, glib_minor_version, glib_micro_version);
 	else
-		g_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		g_print("runtime GTK %d.%d.%d / GLib %d.%d.%d\n",
 			   gtk_major_version, gtk_minor_version, gtk_micro_version,
 			   glib_major_version, glib_minor_version, glib_micro_version);
 	if (show_debug_only)
-		debug_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		debug_print("buildtime GTK %d.%d.%d / GLib %d.%d.%d\n",
 			   GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
 			   GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
 	else
-		g_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+		g_print("buildtime GTK %d.%d.%d / GLib %d.%d.%d\n",
 			   GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
 			   GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
 	
diff --git a/src/main.h b/src/main.h
index b1fb2fd70..53b973211 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mainwindow.c b/src/mainwindow.c
index c5914a704..99cca4b7b 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,5 +1,5 @@
 /*
-   Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+   Claws Mail -- a GTK based, lightweight, and fast e-mail client
    Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
 
    This program is free software; you can redistribute it and/or modify
diff --git a/src/mainwindow.h b/src/mainwindow.h
index ce0b30cac..8cd24dff3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/manual.c b/src/manual.c
index 662072061..e87a8b116 100644
--- a/src/manual.c
+++ b/src/manual.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/manual.h b/src/manual.h
index 186e0cd27..c6472d5c4 100644
--- a/src/manual.h
+++ b/src/manual.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher.c b/src/matcher.c
index f63bcb02c..658c08a0c 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2014 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher.h b/src/matcher.h
index 6b6fbbe66..8a068bb19 100644
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2014 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher_parser.h b/src/matcher_parser.h
index 94cfdf417..c72e6e209 100644
--- a/src/matcher_parser.h
+++ b/src/matcher_parser.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (c) 2001-2002 by Hiroyuki Yamamoto & The Claws Mail Team.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher_parser_lex.h b/src/matcher_parser_lex.h
index 7e44cdaac..754aca19b 100644
--- a/src/matcher_parser_lex.h
+++ b/src/matcher_parser_lex.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index c644acea4..cdd412cb9 100644
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -2,7 +2,7 @@
 
 %{
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (c) 2001-2007 by Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index 19726de99..7bde1430a 100644
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -1,6 +1,6 @@
 %{
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (c) 2001-2014 by Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/matchertypes.h b/src/matchertypes.h
index 2be1bdd2e..46a049b16 100644
--- a/src/matchertypes.h
+++ b/src/matchertypes.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mbox.c b/src/mbox.c
index b9a0dcc7a..ab19fd940 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mbox.h b/src/mbox.h
index aa1aa0333..848774981 100644
--- a/src/mbox.h
+++ b/src/mbox.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/message_search.c b/src/message_search.c
index 4541f44e8..4b6438918 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/message_search.h b/src/message_search.h
index b5218bfaf..000d9e1ab 100644
--- a/src/message_search.h
+++ b/src/message_search.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/messageview.c b/src/messageview.c
index fa8fa385b..c4e3766e8 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/messageview.h b/src/messageview.h
index 792e15d7f..073fc0432 100644
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mh.c b/src/mh.c
index bb77cd664..1b46ad4d0 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mh.h b/src/mh.h
index a05d53a29..89f124bbd 100644
--- a/src/mh.h
+++ b/src/mh.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 3f370fcae..90d1433b1 100644
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mh_gtk.h b/src/mh_gtk.h
index f5bc6f8a6..b075ba061 100644
--- a/src/mh_gtk.h
+++ b/src/mh_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mimeview.c b/src/mimeview.c
index b87a3158d..54303293f 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mimeview.h b/src/mimeview.h
index 7d5f8ccac..4254aa389 100644
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/msgcache.c b/src/msgcache.c
index a54c3b823..a75f9853b 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/msgcache.h b/src/msgcache.h
index fbe1cc1f3..5e380f417 100644
--- a/src/msgcache.h
+++ b/src/msgcache.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mutt.c b/src/mutt.c
index 73a0ff3ef..6d23edd46 100644
--- a/src/mutt.c
+++ b/src/mutt.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/mutt.h b/src/mutt.h
index eb7efdf73..d6f81af52 100644
--- a/src/mutt.h
+++ b/src/mutt.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/news.c b/src/news.c
index 3a7adb14b..450e47386 100644
--- a/src/news.c
+++ b/src/news.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/news.h b/src/news.h
index 7ec2be35d..5a2113d5e 100644
--- a/src/news.h
+++ b/src/news.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/news_gtk.c b/src/news_gtk.c
index 7f0dc7c8a..309c39dca 100644
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/news_gtk.h b/src/news_gtk.h
index 4e34ff1f2..b2e213760 100644
--- a/src/news_gtk.h
+++ b/src/news_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/noticeview.c b/src/noticeview.c
index 1b7e925be..6b02e63ce 100644
--- a/src/noticeview.c
+++ b/src/noticeview.c
@@ -1,5 +1,5 @@
 /* 
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/noticeview.h b/src/noticeview.h
index 9622ef716..b94a016bd 100644
--- a/src/noticeview.h
+++ b/src/noticeview.h
@@ -1,5 +1,5 @@
 /* 
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/oauth2.c b/src/oauth2.c
index e87ca68ce..e760eccfa 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2021-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/oauth2.h b/src/oauth2.h
index ef910d0e9..49ff59097 100644
--- a/src/oauth2.h
+++ b/src/oauth2.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2020 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/partial_download.c b/src/partial_download.c
index 49dc37530..c82111c01 100644
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Colin Leroy <colin@colino.net>
  * and the Claws Mail team
  *
diff --git a/src/partial_download.h b/src/partial_download.h
index 35a727786..2a4119af7 100644
--- a/src/partial_download.h
+++ b/src/partial_download.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/password.c b/src/password.c
index 3e514b047..dc0203bd4 100644
--- a/src/password.c
+++ b/src/password.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016-2021 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/password.h b/src/password.h
index 68ab75db8..bc083d487 100644
--- a/src/password.h
+++ b/src/password.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/password_gtk.c b/src/password_gtk.c
index e839eb116..1c1355cad 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016-2021 the Claws Mail team and Andrej Kacian
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/password_gtk.h b/src/password_gtk.h
index bb40ffdb9..8841b9df9 100644
--- a/src/password_gtk.h
+++ b/src/password_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/passwordstore.c b/src/passwordstore.c
index eddf648ed..c25cd4ddc 100644
--- a/src/passwordstore.c
+++ b/src/passwordstore.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/passwordstore.h b/src/passwordstore.h
index 125e65773..29c82b438 100644
--- a/src/passwordstore.h
+++ b/src/passwordstore.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/pine.c b/src/pine.c
index ae00b7ad1..28671fe94 100644
--- a/src/pine.c
+++ b/src/pine.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/pine.h b/src/pine.h
index dd06868aa..1a80955c6 100644
--- a/src/pine.h
+++ b/src/pine.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/acpi_notifier/acpi_notifier.c b/src/plugins/acpi_notifier/acpi_notifier.c
index 322500215..9125af905 100644
--- a/src/plugins/acpi_notifier/acpi_notifier.c
+++ b/src/plugins/acpi_notifier/acpi_notifier.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2019 Colin Leroy <colin@colino.net>
  * 	and the Claws Mail Team
  *
- * Sylpheed is a GTK+ based, lightweight, and fast e-mail client
+ * Sylpheed is a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/address_keeper/address_keeper.c b/src/plugins/address_keeper/address_keeper.c
index a7c07ebb6..3af5ecd0e 100644
--- a/src/plugins/address_keeper/address_keeper.c
+++ b/src/plugins/address_keeper/address_keeper.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2009-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/address_keeper/address_keeper.h b/src/plugins/address_keeper/address_keeper.h
index a68982f56..8e3323ee2 100644
--- a/src/plugins/address_keeper/address_keeper.h
+++ b/src/plugins/address_keeper/address_keeper.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2009-2018 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index dfb32c674..6d63d462c 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2009-2018 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/address_keeper/address_keeper_prefs.h b/src/plugins/address_keeper/address_keeper_prefs.h
index 3145be7f0..1f518e3ef 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.h
+++ b/src/plugins/address_keeper/address_keeper_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2009-2018 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/archiver.c b/src/plugins/archive/archiver.c
index 568cd4654..8110ce536 100644
--- a/src/plugins/archive/archiver.c
+++ b/src/plugins/archive/archiver.c
@@ -1,7 +1,7 @@
 /* vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/archiver.h b/src/plugins/archive/archiver.h
index 42fde0ba2..02876c08b 100644
--- a/src/plugins/archive/archiver.h
+++ b/src/plugins/archive/archiver.h
@@ -1,7 +1,7 @@
 /* vim: set textwidth=80 tabstop=4: */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index 0eacd2687..f36027e0b 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -1,7 +1,7 @@
 /* vim: set textwidth=80 tabstop=4 */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/archiver_prefs.c b/src/plugins/archive/archiver_prefs.c
index cadb4ef02..950839349 100644
--- a/src/plugins/archive/archiver_prefs.c
+++ b/src/plugins/archive/archiver_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/archiver_prefs.h b/src/plugins/archive/archiver_prefs.h
index 4da8c73b9..2cf6ad007 100644
--- a/src/plugins/archive/archiver_prefs.h
+++ b/src/plugins/archive/archiver_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 0a86eded1..4ecc6a01d 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/archive/libarchive_archive.h b/src/plugins/archive/libarchive_archive.h
index 4ceb2fed5..a29efedef 100644
--- a/src/plugins/archive/libarchive_archive.h
+++ b/src/plugins/archive/libarchive_archive.h
@@ -1,7 +1,7 @@
 /* vim: set textwidth=80 tabstop=4: */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index ae0e12783..8cbcb7084 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2022 Colin Leroy <colin@colino.net>
  * 	 and the Claws Mail Team
  *
- * Sylpheed is a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail is a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/attachwarner/attachwarner.c b/src/plugins/attachwarner/attachwarner.c
index 3a323424d..78a5de18b 100644
--- a/src/plugins/attachwarner/attachwarner.c
+++ b/src/plugins/attachwarner/attachwarner.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022  Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/attachwarner/attachwarner.h b/src/plugins/attachwarner/attachwarner.h
index 26bbdf049..4f61126e4 100644
--- a/src/plugins/attachwarner/attachwarner.h
+++ b/src/plugins/attachwarner/attachwarner.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2021 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index 578926fd3..cbdfb1bfe 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/attachwarner/attachwarner_prefs.h b/src/plugins/attachwarner/attachwarner_prefs.h
index 93b7215e4..f4b89f5cc 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.h
+++ b/src/plugins/attachwarner/attachwarner_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2021 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 92f239fc2..8e4e7fc1f 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/bogofilter/bogofilter.h b/src/plugins/bogofilter/bogofilter.h
index ce49b5752..841e037ed 100644
--- a/src/plugins/bogofilter/bogofilter.h
+++ b/src/plugins/bogofilter/bogofilter.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 4d5891128..d6792f9bc 100644
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index e93a2e43b..b4d59cb11 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and
  * Colin Leroy <colin@colino.net>
  *
diff --git a/src/plugins/bsfilter/bsfilter.h b/src/plugins/bsfilter/bsfilter.h
index c81a6c2ea..8c876e929 100644
--- a/src/plugins/bsfilter/bsfilter.h
+++ b/src/plugins/bsfilter/bsfilter.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c
index 1753005d2..15283bf2b 100644
--- a/src/plugins/bsfilter/bsfilter_gtk.c
+++ b/src/plugins/bsfilter/bsfilter_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index ab3d4e0b7..34274baa4 100644
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2017 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/clamd/clamav_plugin.h b/src/plugins/clamd/clamav_plugin.h
index d6c6285ee..0362a9fc4 100644
--- a/src/plugins/clamd/clamav_plugin.h
+++ b/src/plugins/clamd/clamav_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2017 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index 887c91a5b..0b7e20abc 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index ee3e4e8bb..4c18b6e33 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -1,7 +1,7 @@
 /* vim: set textwidth=80 tabstop=4: */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.h b/src/plugins/clamd/libclamd/clamd-plugin.h
index d8ee2687d..34fa56f3b 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.h
+++ b/src/plugins/clamd/libclamd/clamd-plugin.h
@@ -1,7 +1,7 @@
 /* vim: set textwidth=80 tabstop=4: */
 
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index 817c46ef8..e19837dc7 100644
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
index 3d1cdec07..9b0519fb3 100644
--- a/src/plugins/dillo/dillo_prefs.c
+++ b/src/plugins/dillo/dillo_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/dillo/dillo_prefs.h b/src/plugins/dillo/dillo_prefs.h
index d4b5b4dfc..7b3dd57c7 100644
--- a/src/plugins/dillo/dillo_prefs.h
+++ b/src/plugins/dillo/dillo_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
index 8f0a8062f..f90d54b39 100644
--- a/src/plugins/dillo/dillo_viewer.c
+++ b/src/plugins/dillo/dillo_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 3b5534307..0064d6e45 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -1,6 +1,6 @@
 /*
  * == Fancy Plugin ==
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 Salvatore De Paolis and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/fancy/fancy_prefs.h b/src/plugins/fancy/fancy_prefs.h
index fcb840857..9b505c5cf 100644
--- a/src/plugins/fancy/fancy_prefs.h
+++ b/src/plugins/fancy/fancy_prefs.h
@@ -1,5 +1,5 @@
 /* 
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 1999-2014 the Claws Mail Team
  * == Fancy Plugin ==
  * This file Copyright (C) 2009 -2014 Salvatore De Paolis
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 7eea6b6f0..b7d1988ea 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
  * Copyright(C) 1999-2021 the Claws Mail Team
  * This file Copyright (C) 2009-2014 Salvatore De Paolis
diff --git a/src/plugins/fancy/fancy_viewer.h b/src/plugins/fancy/fancy_viewer.h
index 51dea06ed..50d388ef6 100644
--- a/src/plugins/fancy/fancy_viewer.h
+++ b/src/plugins/fancy/fancy_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
  * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse@claws-mail.org>
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin.c b/src/plugins/fetchinfo/fetchinfo_plugin.c
index 5854992f5..39f239442 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin.h b/src/plugins/fetchinfo/fetchinfo_plugin.h
index c5ad7b832..a305222ba 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin.h
+++ b/src/plugins/fetchinfo/fetchinfo_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
index e790f67a7..ae6c23f12 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
index 9d616999d..e78092ecd 100644
--- a/src/plugins/gdata/cm_gdata_prefs.c
+++ b/src/plugins/gdata/cm_gdata_prefs.c
@@ -1,6 +1,6 @@
 /*
  * GData plugin for Claws-Mail
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2011-2018 Holger Berndt and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/keyword_warner/keyword_warner.c b/src/plugins/keyword_warner/keyword_warner.c
index 3dd0fc9d9..806e3fada 100644
--- a/src/plugins/keyword_warner/keyword_warner.c
+++ b/src/plugins/keyword_warner/keyword_warner.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022  Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/keyword_warner/keyword_warner.h b/src/plugins/keyword_warner/keyword_warner.h
index 2d436fc2c..c473a73e0 100644
--- a/src/plugins/keyword_warner/keyword_warner.h
+++ b/src/plugins/keyword_warner/keyword_warner.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.c b/src/plugins/keyword_warner/keyword_warner_prefs.c
index 7546884e9..0f1b5d2ff 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.c
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.h b/src/plugins/keyword_warner/keyword_warner_prefs.h
index f6db3bfc6..875b33919 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.h
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 265f30b92..54d933979 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar.h b/src/plugins/libravatar/libravatar.h
index 9fe469584..6ddc4a775 100644
--- a/src/plugins/libravatar/libravatar.h
+++ b/src/plugins/libravatar/libravatar.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_cache.c b/src/plugins/libravatar/libravatar_cache.c
index 9160e5d83..98e4dfdf3 100644
--- a/src/plugins/libravatar/libravatar_cache.c
+++ b/src/plugins/libravatar/libravatar_cache.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_cache.h b/src/plugins/libravatar/libravatar_cache.h
index 2d97e9c36..a3d57447a 100644
--- a/src/plugins/libravatar/libravatar_cache.h
+++ b/src/plugins/libravatar/libravatar_cache.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_federation.c b/src/plugins/libravatar/libravatar_federation.c
index 01734605f..859417f94 100644
--- a/src/plugins/libravatar/libravatar_federation.c
+++ b/src/plugins/libravatar/libravatar_federation.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_federation.h b/src/plugins/libravatar/libravatar_federation.h
index 6cc917cd9..878e3dfcb 100644
--- a/src/plugins/libravatar/libravatar_federation.h
+++ b/src/plugins/libravatar/libravatar_federation.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_image.c b/src/plugins/libravatar/libravatar_image.c
index 6d62076a4..92d6b87ca 100644
--- a/src/plugins/libravatar/libravatar_image.c
+++ b/src/plugins/libravatar/libravatar_image.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_image.h b/src/plugins/libravatar/libravatar_image.h
index dc298b75c..7f048de26 100644
--- a/src/plugins/libravatar/libravatar_image.h
+++ b/src/plugins/libravatar/libravatar_image.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_missing.c b/src/plugins/libravatar/libravatar_missing.c
index f42ea6a6c..065aa7876 100644
--- a/src/plugins/libravatar/libravatar_missing.c
+++ b/src/plugins/libravatar/libravatar_missing.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_missing.h b/src/plugins/libravatar/libravatar_missing.h
index 4656084d6..ad024318e 100644
--- a/src/plugins/libravatar/libravatar_missing.h
+++ b/src/plugins/libravatar/libravatar_missing.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index 0f68fa9a0..45c839d1c 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/libravatar/libravatar_prefs.h b/src/plugins/libravatar/libravatar_prefs.h
index f6445358b..67ec91eaf 100644
--- a/src/plugins/libravatar/libravatar_prefs.h
+++ b/src/plugins/libravatar/libravatar_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/container_linux.cpp b/src/plugins/litehtml_viewer/container_linux.cpp
index 5de5086ab..ca6c2cd65 100644
--- a/src/plugins/litehtml_viewer/container_linux.cpp
+++ b/src/plugins/litehtml_viewer/container_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/container_linux.h b/src/plugins/litehtml_viewer/container_linux.h
index 05c66ce4f..a9937e328 100644
--- a/src/plugins/litehtml_viewer/container_linux.h
+++ b/src/plugins/litehtml_viewer/container_linux.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
index 7efa413d6..41feb23c1 100644
--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
index 3d97c99d0..ac0f5352f 100644
--- a/src/plugins/litehtml_viewer/http.cpp
+++ b/src/plugins/litehtml_viewer/http.cpp
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/http.h b/src/plugins/litehtml_viewer/http.h
index d533dc59d..89e06e643 100644
--- a/src/plugins/litehtml_viewer/http.h
+++ b/src/plugins/litehtml_viewer/http.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_prefs.c b/src/plugins/litehtml_viewer/lh_prefs.c
index f6ccc9d4d..c3aed87c1 100644
--- a/src/plugins/litehtml_viewer/lh_prefs.c
+++ b/src/plugins/litehtml_viewer/lh_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_prefs.h b/src/plugins/litehtml_viewer/lh_prefs.h
index cd73f8152..310725b8d 100644
--- a/src/plugins/litehtml_viewer/lh_prefs.h
+++ b/src/plugins/litehtml_viewer/lh_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index 13b85a364..b6109fd47 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_viewer.h b/src/plugins/litehtml_viewer/lh_viewer.h
index c22727c51..d4dc66aeb 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.h
+++ b/src/plugins/litehtml_viewer/lh_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
index 75a2bb800..3c1259d0c 100644
--- a/src/plugins/litehtml_viewer/lh_widget.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget.cpp
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_widget.h b/src/plugins/litehtml_viewer/lh_widget.h
index 827fad49e..4688de9fe 100644
--- a/src/plugins/litehtml_viewer/lh_widget.h
+++ b/src/plugins/litehtml_viewer/lh_widget.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/lh_widget_text.cpp b/src/plugins/litehtml_viewer/lh_widget_text.cpp
index f6161a05e..97cbe5721 100644
--- a/src/plugins/litehtml_viewer/lh_widget_text.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget_text.cpp
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * litehtml callbacks related to text rendering
diff --git a/src/plugins/litehtml_viewer/lh_widget_wrapped.h b/src/plugins/litehtml_viewer/lh_widget_wrapped.h
index 2f1581262..7ee143bb5 100644
--- a/src/plugins/litehtml_viewer/lh_widget_wrapped.h
+++ b/src/plugins/litehtml_viewer/lh_widget_wrapped.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/litehtml_viewer/plugin.c b/src/plugins/litehtml_viewer/plugin.c
index aca1677bb..51ad1f68d 100644
--- a/src/plugins/litehtml_viewer/plugin.c
+++ b/src/plugins/litehtml_viewer/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright(C) 2019 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/mailmbox/mailmbox_folder.c b/src/plugins/mailmbox/mailmbox_folder.c
index 0bac1491d..3e6824052 100644
--- a/src/plugins/mailmbox/mailmbox_folder.c
+++ b/src/plugins/mailmbox/mailmbox_folder.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/mailmbox/mailmbox_folder.h b/src/plugins/mailmbox/mailmbox_folder.h
index 83e973d68..1e3d1fef2 100644
--- a/src/plugins/mailmbox/mailmbox_folder.h
+++ b/src/plugins/mailmbox/mailmbox_folder.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index ab0685098..265307cbd 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 the Claws Mail Team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index cf26ed09a..9aef759c7 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index a15d03216..b611ecac8 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2022 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_editor.h b/src/plugins/managesieve/sieve_editor.h
index 18228c4a2..f69cb7a04 100644
--- a/src/plugins/managesieve/sieve_editor.h
+++ b/src/plugins/managesieve/sieve_editor.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2015 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 8869d1d51..eabeb825f 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2022 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_manager.h b/src/plugins/managesieve/sieve_manager.h
index fb5c9ba0e..70646a5b2 100644
--- a/src/plugins/managesieve/sieve_manager.h
+++ b/src/plugins/managesieve/sieve_manager.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2015 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_plugin.c b/src/plugins/managesieve/sieve_plugin.c
index 5edc70b53..4c6bbd989 100644
--- a/src/plugins/managesieve/sieve_plugin.c
+++ b/src/plugins/managesieve/sieve_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 the Claws Mail Team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index cec3c201c..9e30b499d 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2015 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/managesieve/sieve_prefs.h b/src/plugins/managesieve/sieve_prefs.h
index e378d6ac6..c362ea2a6 100644
--- a/src/plugins/managesieve/sieve_prefs.h
+++ b/src/plugins/managesieve/sieve_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2015 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
diff --git a/src/plugins/newmail/newmail.c b/src/plugins/newmail/newmail.c
index 6616722d1..049260924 100644
--- a/src/plugins/newmail/newmail.c
+++ b/src/plugins/newmail/newmail.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2015 H.Merijn Brand and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
index 9ebbe5e2a..b055e48f5 100644
--- a/src/plugins/notification/notification_banner.c
+++ b/src/plugins/notification/notification_banner.c
@@ -1,6 +1,6 @@
 /*
  * Notification plugin for Claws Mail
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2021 Holger Berndt and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 7a9afc85c..172a41bed 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Notification plugin for Claws-Mail
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2021 the Claws Mail team and Holger Berndt
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 5615c6874..10c068b03 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Salvatore De Paolis
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pdf_viewer/poppler_viewer.h b/src/plugins/pdf_viewer/poppler_viewer.h
index 4a5ba3434..c536fcfed 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.h
+++ b/src/plugins/pdf_viewer/poppler_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Salvatore De Paolis & the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_gtk.c b/src/plugins/perl/perl_gtk.c
index 3a628a3dc..0856186ff 100644
--- a/src/plugins/perl/perl_gtk.c
+++ b/src/plugins/perl/perl_gtk.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_gtk.h b/src/plugins/perl/perl_gtk.h
index f570208cc..28c0797b6 100644
--- a/src/plugins/perl/perl_gtk.h
+++ b/src/plugins/perl/perl_gtk.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index 9b212ca90..1ac005e19 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2022 Holger Berndt and the Claws Mail Team
  *
- * Claws Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Claws Mail are GTK based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2022 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.h b/src/plugins/perl/perl_plugin.h
index d461a1a91..8fc9af2f0 100644
--- a/src/plugins/perl/perl_plugin.h
+++ b/src/plugins/perl/perl_plugin.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004-2007 Holger Berndt
  *
- * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK based, lightweight, and fast e-mail clients
  * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 44d541daa..df6fff894 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -1,4 +1,4 @@
-/* passphrase.c - GTK+ based passphrase callback
+/* passphrase.c - GTK based passphrase callback
  * Copyright (C) 2001-2022 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/passphrase.h b/src/plugins/pgpcore/passphrase.h
index 1f5ee9f81..649b9a9b9 100644
--- a/src/plugins/pgpcore/passphrase.h
+++ b/src/plugins/pgpcore/passphrase.h
@@ -1,4 +1,4 @@
-/* passphrase.h - GTK+ based passphrase callback
+/* passphrase.h - GTK based passphrase callback
  *      Copyright (C) 2001-2012 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/pgp_utils.c b/src/plugins/pgpcore/pgp_utils.c
index dc9dfd612..0489ec820 100644
--- a/src/plugins/pgpcore/pgp_utils.c
+++ b/src/plugins/pgpcore/pgp_utils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/pgpcore/pgp_utils.h b/src/plugins/pgpcore/pgp_utils.h
index eb603cb40..9e07f5e9d 100644
--- a/src/plugins/pgpcore/pgp_utils.h
+++ b/src/plugins/pgpcore/pgp_utils.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index bb5212105..8865c1c1b 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
diff --git a/src/plugins/pgpcore/pgp_viewer.h b/src/plugins/pgpcore/pgp_viewer.h
index c518675cf..d61d1d1b7 100644
--- a/src/plugins/pgpcore/pgp_viewer.h
+++ b/src/plugins/pgpcore/pgp_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail team
  * This file Copyright (C) 2006 Colin Leroy <colin@colino.net>
  *
diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c
index 42bb840d4..1dc1963a3 100644
--- a/src/plugins/pgpcore/plugin.c
+++ b/src/plugins/pgpcore/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index d5019daf0..2dbd5d505 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2019 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/prefs_gpg.h b/src/plugins/pgpcore/prefs_gpg.h
index 70d308a0c..d9492c1e2 100644
--- a/src/plugins/pgpcore/prefs_gpg.h
+++ b/src/plugins/pgpcore/prefs_gpg.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2015 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 62c77de2a..8d5d57c59 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -1,4 +1,4 @@
-/* select-keys.c - GTK+ based key selection
+/* select-keys.c - GTK based key selection
  * Copyright (C) 2001-2022 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify        
diff --git a/src/plugins/pgpcore/select-keys.h b/src/plugins/pgpcore/select-keys.h
index 8ddb9d501..11df35356 100644
--- a/src/plugins/pgpcore/select-keys.h
+++ b/src/plugins/pgpcore/select-keys.h
@@ -1,4 +1,4 @@
-/* select-keys.h - GTK+ based key selection
+/* select-keys.h - GTK based key selection
  *      Copyright (C) 2001-2012 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 5166a1866..4b3a978e2 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpcore/sgpgme.h b/src/plugins/pgpcore/sgpgme.h
index 8e494af60..5fd3a3e66 100644
--- a/src/plugins/pgpcore/sgpgme.h
+++ b/src/plugins/pgpcore/sgpgme.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index 4dbd2befb..9b89f1f95 100644
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpinline/pgpinline.h b/src/plugins/pgpinline/pgpinline.h
index 40199f085..a51982f3d 100644
--- a/src/plugins/pgpinline/pgpinline.h
+++ b/src/plugins/pgpinline/pgpinline.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c
index 760653146..ff4ed3f1e 100644
--- a/src/plugins/pgpinline/plugin.c
+++ b/src/plugins/pgpinline/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index a3e1142e6..0a91c7035 100644
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpmime/pgpmime.h b/src/plugins/pgpmime/pgpmime.h
index 06a64bde6..6f104e84c 100644
--- a/src/plugins/pgpmime/pgpmime.h
+++ b/src/plugins/pgpmime/pgpmime.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index 5d2507301..b09f75e41 100644
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/clawsmailmodule.c b/src/plugins/python/clawsmailmodule.c
index b5e2c1b23..e8482a1e2 100644
--- a/src/plugins/python/clawsmailmodule.c
+++ b/src/plugins/python/clawsmailmodule.c
@@ -906,8 +906,8 @@ static struct PyModuleDef moduledef = {
   "This module can be used to access some of Claws Mail's data structures\n"
   "in order to extend or modify the user interface or automate repetitive tasks.\n"
   "\n"
-  "Whenever possible, the interface works with standard GTK+ widgets\n"
-  "via the PyGTK bindings, so you can refer to the GTK+ / PyGTK documentation\n"
+  "Whenever possible, the interface works with standard GTK widgets\n"
+  "via the PyGTK bindings, so you can refer to the GTK / PyGTK documentation\n"
   "to find out about all possible options.\n"
   "\n"
   "The interface to Claws Mail in this module is extended on a 'as-needed' basis.\n"
diff --git a/src/plugins/python/examples/README.examples b/src/plugins/python/examples/README.examples
index 55c721085..49448e09c 100644
--- a/src/plugins/python/examples/README.examples
+++ b/src/plugins/python/examples/README.examples
@@ -46,7 +46,7 @@ Table of contents:
   Tomboy Reminder addin into the note.
   To achieve this, this example demonstrates how to talk to other
   programs via D-Bus, as well as how to query additional information
-  from the user using direct GTK+ programming.
+  from the user using direct GTK programming.
 
 * main/Open-Tomboy-Notes
   This example opens all Tomboy notes which link to any of the currently
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index f6202b8f0..0ff7d6be9 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * This file (C) 2008 Andrej Kacian <andrej@kacian.sk>
  *
  * - Export feed list to OPML
diff --git a/src/plugins/rssyl/opml_import.c b/src/plugins/rssyl/opml_import.c
index 7544c5fcc..855f8b2e1 100644
--- a/src/plugins/rssyl/opml_import.c
+++ b/src/plugins/rssyl/opml_import.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index af9f2206c..72f9398b3 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/plugin.c b/src/plugins/rssyl/plugin.c
index ea32ec715..45528afbc 100644
--- a/src/plugins/rssyl/plugin.c
+++ b/src/plugins/rssyl/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 943e37e99..47dd27699 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index f3b684904..1f2c34c09 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index d14755285..37f05b72c 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005-2022 Andrej Kacian <andrej@kacian.sk> and the
  * Claws Mail team
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index dab0a4824..0ba84b610 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 7ad179b2c..63d781e5b 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2021 the Claws Mail team
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_gtk.c b/src/plugins/rssyl/rssyl_gtk.c
index 1fd4ecfc5..e41d51197 100644
--- a/src/plugins/rssyl/rssyl_gtk.c
+++ b/src/plugins/rssyl/rssyl_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index adf7e56b4..bf2249b00 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2021 the Claws Mail team
  * This file (C) 2005-2015 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_prefs.h b/src/plugins/rssyl/rssyl_prefs.h
index 5e746f038..f597b4fd3 100644
--- a/src/plugins/rssyl/rssyl_prefs.h
+++ b/src/plugins/rssyl/rssyl_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
  * This file (C) 2005-2015 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index 807bafbea..6a21c32ab 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 0ad5a61b6..4e9043a82 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 the Claws Mail team
  * This file (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index d60fc5f13..726768728 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005 Andrej Kacian <andrej@kacian.sk>
  *
  * - a strreplace function (something like sed's s/foo/bar/g)
diff --git a/src/plugins/smime/plugin.c b/src/plugins/smime/plugin.c
index 78e35fb17..a026f0317 100644
--- a/src/plugins/smime/plugin.c
+++ b/src/plugins/smime/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
index a56cc2206..d7221cad7 100644
--- a/src/plugins/smime/smime.c
+++ b/src/plugins/smime/smime.c
@@ -1,5 +1,5 @@
 /* 
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/smime/smime.h b/src/plugins/smime/smime.h
index 311aa4f6c..c2f7d6c1d 100644
--- a/src/plugins/smime/smime.h
+++ b/src/plugins/smime/smime.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c
index 202e01c19..ea923c6a0 100644
--- a/src/plugins/spam_report/spam_report.c
+++ b/src/plugins/spam_report/spam_report.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/spam_report/spam_report_prefs.c b/src/plugins/spam_report/spam_report_prefs.c
index b4d9f9409..e87430bd7 100644
--- a/src/plugins/spam_report/spam_report_prefs.c
+++ b/src/plugins/spam_report/spam_report_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/spam_report/spam_report_prefs.h b/src/plugins/spam_report/spam_report_prefs.h
index ed46b3a00..f254c02d6 100644
--- a/src/plugins/spam_report/spam_report_prefs.h
+++ b/src/plugins/spam_report/spam_report_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 99ac93339..19a188968 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/spamassassin/spamassassin.h b/src/plugins/spamassassin/spamassassin.h
index c13d4bc90..4f447dc49 100644
--- a/src/plugins/spamassassin/spamassassin.h
+++ b/src/plugins/spamassassin/spamassassin.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index d17da5e57..f6ca87f4d 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/tnef_parse/tnef_dump.c b/src/plugins/tnef_parse/tnef_dump.c
index 6bccbe7b4..c20eb5e71 100644
--- a/src/plugins/tnef_parse/tnef_dump.c
+++ b/src/plugins/tnef_parse/tnef_dump.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/tnef_parse/tnef_dump.h b/src/plugins/tnef_parse/tnef_dump.h
index f9f49cd5b..dfc43457d 100644
--- a/src/plugins/tnef_parse/tnef_dump.h
+++ b/src/plugins/tnef_parse/tnef_dump.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/tnef_parse/tnef_parse.c b/src/plugins/tnef_parse/tnef_parse.c
index 90aaf1597..4f033b402 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
  * and the Claws Mail Team
  *
diff --git a/src/plugins/vcalendar/common-views.c b/src/plugins/vcalendar/common-views.c
index 32e50006e..2ff6272bc 100644
--- a/src/plugins/vcalendar/common-views.c
+++ b/src/plugins/vcalendar/common-views.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  *
  * Copyright (c) 2007-2008 Juha Kautto (juha at xfce.org)
  * Copyright (c) 2008 Colin Leroy (colin@colino.net)
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
index a257ff530..156d813b0 100644
--- a/src/plugins/vcalendar/day-view.c
+++ b/src/plugins/vcalendar/day-view.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  *
  * Copyright (c) 2007-2008 Juha Kautto (juha at xfce.org)
  * Copyright (c) 2008-2022 the Claws Mail Team and  Colin Leroy (colin@colino.net)
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
index c2189efd2..0529559f8 100644
--- a/src/plugins/vcalendar/month-view.c
+++ b/src/plugins/vcalendar/month-view.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  *
  * Copyright (c) 2007-2008 Juha Kautto (juha at xfce.org)
  * Copyright (c) 2008-2021 the Claws Mail team and Colin Leroy
diff --git a/src/plugins/vcalendar/plugin.c b/src/plugins/vcalendar/plugin.c
index f3a55e5b4..ba43d1a98 100644
--- a/src/plugins/vcalendar/plugin.c
+++ b/src/plugins/vcalendar/plugin.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_dbus.c b/src/plugins/vcalendar/vcal_dbus.c
index f60987252..b05fadeb6 100644
--- a/src/plugins/vcalendar/vcal_dbus.c
+++ b/src/plugins/vcalendar/vcal_dbus.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2011 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_dbus.h b/src/plugins/vcalendar/vcal_dbus.h
index 823439725..db8010ae6 100644
--- a/src/plugins/vcalendar/vcal_dbus.h
+++ b/src/plugins/vcalendar/vcal_dbus.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2011 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 073fbd46a..9c8d4a5af 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 Colin Leroy <colin@colino.net> and
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_folder.h b/src/plugins/vcalendar/vcal_folder.h
index b25e0838a..c0e6c74e7 100644
--- a/src/plugins/vcalendar/vcal_folder.h
+++ b/src/plugins/vcalendar/vcal_folder.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_interface.h b/src/plugins/vcalendar/vcal_interface.h
index 99da3ea82..753fad7a4 100644
--- a/src/plugins/vcalendar/vcal_interface.h
+++ b/src/plugins/vcalendar/vcal_interface.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index f49271ce2..6c17c42cb 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_manager.h b/src/plugins/vcalendar/vcal_manager.h
index c63a8672e..e0bcdcad4 100644
--- a/src/plugins/vcalendar/vcal_manager.h
+++ b/src/plugins/vcalendar/vcal_manager.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 33485798d..96779cfce 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 Colin Leroy <colin@colino.net> and
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.h b/src/plugins/vcalendar/vcal_meeting_gtk.h
index 1400e208a..489de13f3 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.h
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index 437e942f5..5877a06f6 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/vcalendar/vcal_prefs.h b/src/plugins/vcalendar/vcal_prefs.h
index 8a89f3795..d11ed7046 100644
--- a/src/plugins/vcalendar/vcal_prefs.h
+++ b/src/plugins/vcalendar/vcal_prefs.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index b2e66f459..4223f6f7f 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/vcalendar/vcalendar.h b/src/plugins/vcalendar/vcalendar.h
index ff14babb7..9eb04c070 100644
--- a/src/plugins/vcalendar/vcalendar.h
+++ b/src/plugins/vcalendar/vcalendar.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/pop.c b/src/pop.c
index 0954df85c..b11ab4c6f 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/pop.h b/src/pop.h
index 4fc5257d4..e3e5be824 100644
--- a/src/pop.h
+++ b/src/pop.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 744a36492..7e84ec7a3 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_account.h b/src/prefs_account.h
index cad95a882..49b6da000 100644
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 0f0205db6..3ae127bfa 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_actions.h b/src/prefs_actions.h
index 59b2e4766..577700994 100644
--- a/src/prefs_actions.h
+++ b/src/prefs_actions.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_common.c b/src/prefs_common.c
index e2ad46b29..f61f6a9e3 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_common.h b/src/prefs_common.h
index aa9587e94..7175cc68f 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index a91269d79..c3d19b8fd 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2021 the Claws Mail Team and Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_compose_writing.h b/src/prefs_compose_writing.h
index f47350113..c181f37aa 100644
--- a/src/prefs_compose_writing.h
+++ b/src/prefs_compose_writing.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 02508073c..bdcde7332 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_customheader.h b/src/prefs_customheader.h
index 3944dd7cf..160842d6e 100644
--- a/src/prefs_customheader.h
+++ b/src/prefs_customheader.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 9fdde171d..f6bc931c5 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_display_header.h b/src/prefs_display_header.h
index 371803cba..ce8dfe4f0 100644
--- a/src/prefs_display_header.h
+++ b/src/prefs_display_header.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c
index 62dbaeb68..8ae0eec25 100644
--- a/src/prefs_ext_prog.c
+++ b/src/prefs_ext_prog.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_ext_prog.h b/src/prefs_ext_prog.h
index 78405cc77..a3eab885a 100644
--- a/src/prefs_ext_prog.h
+++ b/src/prefs_ext_prog.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index f5a6c1bf8..81e0f59bb 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_filtering.h b/src/prefs_filtering.h
index de53a5270..e53a40c1f 100644
--- a/src/prefs_filtering.h
+++ b/src/prefs_filtering.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 1954410c1..7016af880 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_filtering_action.h b/src/prefs_filtering_action.h
index b1d92e518..07da5cf6b 100644
--- a/src/prefs_filtering_action.h
+++ b/src/prefs_filtering_action.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 48725041a..5ee397c86 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_folder_column.h b/src/prefs_folder_column.h
index db50885c3..236351599 100644
--- a/src/prefs_folder_column.h
+++ b/src/prefs_folder_column.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 503511277..251ea7ce3 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_folder_item.h b/src/prefs_folder_item.h
index d3a4d08d0..70cf890a5 100644
--- a/src/prefs_folder_item.h
+++ b/src/prefs_folder_item.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 685954e7e..24dffd114 100644
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2019 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_fonts.h b/src/prefs_fonts.h
index 56cf1891e..2664eb9e8 100644
--- a/src/prefs_fonts.h
+++ b/src/prefs_fonts.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index ccd34c64f..b4fc57fb9 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h
index ba41d244b..aa55e812e 100644
--- a/src/prefs_gtk.h
+++ b/src/prefs_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_image_viewer.c b/src/prefs_image_viewer.c
index a8a29f564..fbb064b95 100644
--- a/src/prefs_image_viewer.c
+++ b/src/prefs_image_viewer.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_image_viewer.h b/src/prefs_image_viewer.h
index 90a92958d..e46b71318 100644
--- a/src/prefs_image_viewer.h
+++ b/src/prefs_image_viewer.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index f085e29bf..79ae2a1be 100644
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Tristan Chabredier <wwp@claws-mail.org> and 
  * the Claws Mail team
  *
diff --git a/src/prefs_logging.h b/src/prefs_logging.h
index 92ca1e93b..fa12a4d8e 100644
--- a/src/prefs_logging.h
+++ b/src/prefs_logging.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Tristan Chabredier <wwp@claws-mail.org> and 
  * the Claws Mail team
  *
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 09662d8c6..e1b05478f 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_matcher.h b/src/prefs_matcher.h
index 2a9f6b5d7..bef782882 100644
--- a/src/prefs_matcher.h
+++ b/src/prefs_matcher.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_message.c b/src/prefs_message.c
index 7d5da9b15..6a7e7ee0e 100644
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2020 the Claws Mail Team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_message.h b/src/prefs_message.h
index 7f3f530c1..adb1d008f 100644
--- a/src/prefs_message.h
+++ b/src/prefs_message.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_migration.c b/src/prefs_migration.c
index 8077387bc..51cb439b0 100644
--- a/src/prefs_migration.c
+++ b/src/prefs_migration.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_migration.h b/src/prefs_migration.h
index 0adf38cf7..a31792188 100644
--- a/src/prefs_migration.h
+++ b/src/prefs_migration.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2016 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 1b090e733..bee8acd52 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2021 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_msg_colors.h b/src/prefs_msg_colors.h
index f3ddac10c..aa53940c2 100644
--- a/src/prefs_msg_colors.h
+++ b/src/prefs_msg_colors.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_other.c b/src/prefs_other.c
index f78a0a370..9a26d6511 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2022 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_other.h b/src/prefs_other.h
index 0e4b69eae..84d74cdd4 100644
--- a/src/prefs_other.h
+++ b/src/prefs_other.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_proxy.c b/src/prefs_proxy.c
index 16420bf68..6956986e7 100644
--- a/src/prefs_proxy.c
+++ b/src/prefs_proxy.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2018-2019 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_proxy.h b/src/prefs_proxy.h
index e73a010c1..eec236401 100644
--- a/src/prefs_proxy.h
+++ b/src/prefs_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2018 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
index a973fbc1d..aeeea9cf2 100644
--- a/src/prefs_quote.c
+++ b/src/prefs_quote.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_quote.h b/src/prefs_quote.h
index 69187493f..8fba51212 100644
--- a/src/prefs_quote.h
+++ b/src/prefs_quote.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index bacec9df1..84881e9fe 100644
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2016 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_receive.h b/src/prefs_receive.h
index 7f7db2c15..d57348588 100644
--- a/src/prefs_receive.h
+++ b/src/prefs_receive.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_send.c b/src/prefs_send.c
index 7ae2df395..9e7f461d9 100644
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2019 Colin Leroy & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_send.h b/src/prefs_send.h
index 42b34c2a0..be08565fa 100644
--- a/src/prefs_send.h
+++ b/src/prefs_send.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index 3d96fc29e..3fee1cef0 100644
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_spelling.h b/src/prefs_spelling.h
index bd0568b8b..b40da474d 100644
--- a/src/prefs_spelling.h
+++ b/src/prefs_spelling.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index c316000bc..4939830a5 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2022 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summaries.h b/src/prefs_summaries.h
index 646b723b1..688f12b4c 100644
--- a/src/prefs_summaries.h
+++ b/src/prefs_summaries.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 695c9151d..b21e4689a 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summary_column.h b/src/prefs_summary_column.h
index 21fa95ab4..0c42f07c7 100644
--- a/src/prefs_summary_column.h
+++ b/src/prefs_summary_column.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index e2c477dd3..b2e95093d 100644
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_summary_open.h b/src/prefs_summary_open.h
index e0f0a1459..9e4a95d63 100644
--- a/src/prefs_summary_open.h
+++ b/src/prefs_summary_open.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index f115cf2f8..3fed218d1 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2022 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_themes.h b/src/prefs_themes.h
index fabea53ca..82bc8e98d 100644
--- a/src/prefs_themes.h
+++ b/src/prefs_themes.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2003-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 907794f10..a7626c9cb 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_toolbar.h b/src/prefs_toolbar.h
index aef738657..f96a020a9 100644
--- a/src/prefs_toolbar.h
+++ b/src/prefs_toolbar.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index c7e998703..b3624682b 100644
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/prefs_wrapping.h b/src/prefs_wrapping.h
index 8fa867a8a..3e2ed6c06 100644
--- a/src/prefs_wrapping.h
+++ b/src/prefs_wrapping.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2004-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/printing.c b/src/printing.c
index 73526d95f..3d945e197 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2019 Holger Berndt <hb@claws-mail.org>,
  * Colin Leroy <colin@colino.net>, and the Claws Mail team
  *
diff --git a/src/printing.h b/src/printing.h
index 79a29f852..35a022a88 100644
--- a/src/printing.h
+++ b/src/printing.h
@@ -1,4 +1,4 @@
-/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2007-2012 Holger Berndt <hb@claws-mail.org> 
  * and the Claws Mail team
  *
diff --git a/src/privacy.c b/src/privacy.c
index 56da4ce17..87ff87f08 100644
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/privacy.h b/src/privacy.h
index 3aafae9ad..bff974e4d 100644
--- a/src/privacy.h
+++ b/src/privacy.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procheader.c b/src/procheader.c
index fa09943b6..106deadec 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procheader.h b/src/procheader.h
index 50e6c556b..3e5681946 100644
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procmime.c b/src/procmime.c
index 6657caa76..ba6c94d3c 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procmime.h b/src/procmime.h
index 8b6859f9b..5da2f7684 100644
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procmsg.c b/src/procmsg.c
index 1dc660190..bb4bff40a 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/procmsg.h b/src/procmsg.h
index 66cccb58e..029ca0b2c 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/proctypes.h b/src/proctypes.h
index ef6ec5865..8821e3ec9 100644
--- a/src/proctypes.h
+++ b/src/proctypes.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index 65cc9eb92..9d610e99d 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/quote_fmt.h b/src/quote_fmt.h
index 900adeab2..e94394170 100644
--- a/src/quote_fmt.h
+++ b/src/quote_fmt.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/quote_fmt_lex.h b/src/quote_fmt_lex.h
index a2172e40e..6fff24b66 100644
--- a/src/quote_fmt_lex.h
+++ b/src/quote_fmt_lex.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l
index 7af7f61ae..6d70a44fa 100644
--- a/src/quote_fmt_lex.l
+++ b/src/quote_fmt_lex.l
@@ -2,7 +2,7 @@
 
 %{
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (c) 1999-2007 by Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 0dce7b476..225a7578e 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2020 The Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/recv.c b/src/recv.c
index ce2e61d39..90fb3d566 100644
--- a/src/recv.c
+++ b/src/recv.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/recv.h b/src/recv.h
index a7f90fdd8..ae8966f49 100644
--- a/src/recv.h
+++ b/src/recv.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/remotefolder.c b/src/remotefolder.c
index 38ff749d2..d5c666a7f 100644
--- a/src/remotefolder.c
+++ b/src/remotefolder.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/remotefolder.h b/src/remotefolder.h
index 3d34dd267..2c16fc7dc 100644
--- a/src/remotefolder.h
+++ b/src/remotefolder.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2002-2012 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/send_message.c b/src/send_message.c
index 5376d7e86..bf86942d5 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/send_message.h b/src/send_message.h
index c0861fd47..926e8eb0d 100644
--- a/src/send_message.h
+++ b/src/send_message.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/setup.c b/src/setup.c
index bd1c9b711..50c2825ad 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/setup.h b/src/setup.h
index d582a60b8..d306ea94d 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index 181ab0fba..5e9aa8357 100644
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/sourcewindow.h b/src/sourcewindow.h
index b050e0f1d..67cde8818 100644
--- a/src/sourcewindow.h
+++ b/src/sourcewindow.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index fe802de8f..6f2e63704 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/ssl_manager.h b/src/ssl_manager.h
index 5b8dffe23..3da125d87 100644
--- a/src/ssl_manager.h
+++ b/src/ssl_manager.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
diff --git a/src/statusbar.c b/src/statusbar.c
index b6a35ae94..3179896e3 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/statusbar.h b/src/statusbar.h
index d30b41a33..b6976b430 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 648a3f0e4..08e7458d5 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 24538e2af..cf3d35120 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/summary_search.c b/src/summary_search.c
index 0977093ae..82363a92e 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/summary_search.h b/src/summary_search.h
index 35d677f83..18f6dc7cb 100644
--- a/src/summary_search.h
+++ b/src/summary_search.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/summaryview.c b/src/summaryview.c
index 780f3a745..7dc2080b7 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/summaryview.h b/src/summaryview.h
index df28d4e81..6a6d68d19 100644
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/textview.c b/src/textview.c
index c952c4775..b986de84e 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/textview.h b/src/textview.h
index 12531378c..2fab384e4 100644
--- a/src/textview.h
+++ b/src/textview.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/toolbar.c b/src/toolbar.c
index b05ea8d73..51092b9f0 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/toolbar.h b/src/toolbar.h
index 89ffe1d97..6597b55a7 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/undo.c b/src/undo.c
index 291b5ab1e..a4a1f4441 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/undo.h b/src/undo.h
index 3f7634b96..f64011d3f 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -1,5 +1,5 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/uri_opener.c b/src/uri_opener.c
index babb511a0..a2d40b250 100644
--- a/src/uri_opener.c
+++ b/src/uri_opener.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2022 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/uri_opener.h b/src/uri_opener.h
index 0f1c461fb..48ff82742 100644
--- a/src/uri_opener.h
+++ b/src/uri_opener.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and 
  * the Claws Mail team
  *
diff --git a/src/vcard.c b/src/vcard.c
index e7bef946a..71a19d2cb 100644
--- a/src/vcard.c
+++ b/src/vcard.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/vcard.h b/src/vcard.h
index cf0274e59..febf0967a 100644
--- a/src/vcard.h
+++ b/src/vcard.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/viewtypes.h b/src/viewtypes.h
index 1ba944b4b..b7bea70b7 100644
--- a/src/viewtypes.h
+++ b/src/viewtypes.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 2012 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/wizard.c b/src/wizard.c
index 20469c595..0c31ed555 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2021 the Claws Mail team and Colin Leroy
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/wizard.h b/src/wizard.h
index b9164ea18..94af780f5 100644
--- a/src/wizard.h
+++ b/src/wizard.h
@@ -1,5 +1,5 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *