diff --git a/web/donate-de.htm4 b/web/donate-de.htm4
index 73db4575..da16a986 100644
--- a/web/donate-de.htm4
+++ b/web/donate-de.htm4
@@ -1,84 +1,84 @@
 m4_dnl -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`DE')
 m4_define(`EN_FILE', `donate.html')
 
 m4_define(`TITLE', `Spenden')
 m4_define(`MAIN', `donate')
 
 PAGE_START
 
 <div class="donate_header">
  <span class="text">
   Wir lieben Freie Software!<br />
   Sie auch?<br />
   <b>Unterstützen Sie Gpg4win!</b>
  </span>
 </div>
 
 <div id="intro">
 <h2>Spenden</h2>
 <p>Ihre Spende unterstützt die Pflege und Weiterentwicklung von Gpg4win
 und hilft uns die Freie Software Initiative Gpg4win voranzutreiben.
 Wir sind dankbar für jede finanzielle Unterstützung.
 <!-- TODO Update or remove
 Eine Zusammenfassung der bisherigen Spenden finden Sie
 <a href="https://wiki.gnupg.org/Gpg4win/donations">hier</a>. -->
 </p>
 </div>
 
 <div id="main">
   m4_include(`donation-form-de.htm4')
 
   <div id="contract">
   <h2>Beauftragungen</h2>
     <p>Unterstützen Sie die Gpg4win-Weiterentwicklung mit einer konkreten Beauftragung!</p>
 
     <p><b>Als engagierter Anwender</b> können Sie einen bestimmten
     Schritt, wie z.B. Aktualisierung, Beseitigung eines Fehlers oder Hinzufügen einer Funktion
     beauftragen. Jede beauftragte Verbesserung kommt dem Gpg4win-Hauptstrom zu Gute.</p>
 
     <p><b>Als Unternehmen oder Behörde</b> können Sie umfangreiche
     Maßnahmen zur Sicherung einer nachhaltigen und eigenständigen
     Fortführung des Projekts beauftragen. Sie erhalten damit Gpg4win dauerhaft für Ihre Organisation.
     Einher geht der Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im
     Allgemeinen verbessert wird.</p>
 
-    <p>Für mehr Informationen <a href="mailto:gpg4win-professional@intevation.de">kontaktieren Sie uns gerne</a>.
+    <p>Für mehr Informationen <a href="mailto:gpg4win-professional@gpg4win.org">kontaktieren Sie uns gerne</a>.
   </div>
 
   <div id="sponsors">
     <h2>Liste der Spender</h2>
     <p>Die folgende Liste zeigt wer mehr als 10/20 EUR/USD
     für Gpg4win gespendet hatAB 2017 und uns erlaubt das zu veröffentlichen.
 
 
     (Zuletzt aktualisiert: 2020-10-23)</p>
 
     <h3>Spenden 2020 (bis einschl. Q3)</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2020')
     </div>
 
     <h3>Spender 2019</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2019')
     </div>
 
     <h3>Spender 2018</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2018')
     </div>
 
     <h3>Spender 2017</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2017')
     </div>
 
     <h3>Spender in früheren Jahren</h3>
     <p>siehe <a href="https://wiki.gnupg.org/Gpg4win/donations">https://wiki.gnupg.org/Gpg4win/donations</a></p>
 
   </div>
 </div>
diff --git a/web/donate.htm4 b/web/donate.htm4
index 179eb560..2be46b4e 100644
--- a/web/donate.htm4
+++ b/web/donate.htm4
@@ -1,83 +1,83 @@
 m4_dnl                                                          -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`EN')
 m4_define(`DE_FILE', `donate-de.html')
 
 m4_define(`TITLE', `Donate')
 m4_define(`MAIN', `donate')
 
 PAGE_START
 
 <div class="donate_header">
  <span class="text">
   We love Free Software!<br />
   You too?<br />
   <b>Please support Gpg4win!</b>
  </span>
 </div>
 
 <div id="intro">
 <h2>Donate</h2>
 <p>Your donation supports the maintenance and further development of
 Gpg4win and helps us to push the Free Software initiative Gpg4win. We
 are grateful for your financial contribution.<br>
 <!-- A summary of all previous donations you can find
 <a href="https://wiki.gnupg.org/Gpg4win/donations">here</a>. -->
 </p>
 </div>
 
 <div id="main">
   m4_include(`donation-form.htm4')
 
   <div id="contract">
   <h2>Contracts</h2>
     <p>Other than making donations, you could make contract and further support the development of Gpg4win!</p>
 
     <p><b>As an engaged user</b> you could also contract for some specific
     step, update, bug fix or new features.  Take care that your contracted
     improvements will be integrated into the main development of Gpg4win.</p>
 
     <p><b>As a company or authority</b> contract for more extensive measures
     that will ensure continuation of the project.  This way you will
     ensure sustainable availability of Gpg4win for your organization.
     Such measures do provide the collateral benefit of generally improving
     security for data exchange.</p>
 
-    <p>For more information <a href="mailto:gpg4win-professional@intevation.de">please contact us</a>.
+    <p>For more information <a href="mailto:gpg4win-professional@gpg4win.org">please contact us</a>.
   </div>
 
   <div id="sponsors">
     <h2>List of sponsors</h2>
     <p>The following list shows sponsors who donated more than 10/20 USD/EUR
        since 2017 to support us
        and agreed to make their donation public.
 
     (Last updated: 2020-10-23)</p>
 
     <h3>Sponsors 2020 (up to Q3)</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2020')
     </div>
 
     <h3>Sponsors 2019</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2019')
     </div>
 
     <h3>Sponsors 2018</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2018')
     </div>
 
     <h3>Sponsors 2017</h3>
     <div class="sponsornames">
     m4_include(`SPONSORS-2017')
     </div>
 
     <h3>Sponsors in previous years</h3>
     <p>Have a look at <a href="https://wiki.gnupg.org/Gpg4win/donations">the summary of donations.</a></p>
 
   </div>
 </div>
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index 3b0ab45c..c3b718df 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -1,230 +1,230 @@
 <!-- donation form -->
 <div class="donate_box">
     <h3>Bitte spenden Sie für Gpg4win, um die Pflege und Weiterentwicklung zu sichern!</h3>
     <p>Zahlen Sie das, was Gpg4win Ihnen wert ist! – Danke!</p>
 
     <ul class="tabs">
       <!-- paypal -->
       <li>
 	<p><i>Spenden via</i></p>
 	<input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
 	<label for="tab1">PayPal</label>
 	<div id="paypal_tab" class="tab-content">
 	  <img class="pay-logo" src="img/paypal-logo.png">
 	  <!-- amount -->
 	  <br>
 	  <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
 
 	    <div class="amountlabel" id="USD">
 	      <input type="radio" name="amount" value="0" id="amount1" onchange="checkAmount(value)">
 	      <label for="amount1"> $0 </label>
 	      <input type="radio" name="amount" value="10" id="amount2" onchange="checkAmount(value)">
 	      <label for="amount2"> $10 </label>
 	      <input type="radio" name="amount" value="15" id="amount3" onchange="checkAmount(value)">
 	      <label for="amount3"> $15 </label>
 	      <input type="radio" name="amount" value="25" id="amount4" onchange="checkAmount(value)">
 	      <label for="amount4"> $25 </label>
 	      <input type="radio" name="amount" value="" id="freeamount" onchange="checkAmount(value)">
 	      <label for="freeamount" id="freeamountLabelBG">$
 	        <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
 	        onchange="freeamount.value=value; checkAmount(value)" onfocus="checkIt(freeamount.checked)">
 	      </label>
 	    </div>
 
 	    <div class="amountlabel" id="EUR">
 	      <input type="radio" name="amount" value="0" id="amount1_E" onchange="checkAmount(value)">
 	      <label for="amount1_E"> 0€ </label>
 	      <input type="radio" name="amount" value="10" id="amount2_E" onchange="checkAmount(value)">
 	      <label for="amount2_E"> 10€ </label>
 	      <input type="radio" name="amount" value="15" id="amount3_E" onchange="checkAmount(value)" checked="checked">
 	      <label for="amount3_E"> 15€ </label>
 	      <input type="radio" name="amount" value="25" id="amount4_E" onchange="checkAmount(value)">
 	      <label for="amount4_E"> 25€ </label>
 	      <input type="radio" name="amount" value="" id="freeamount_E" onchange="checkAmount(value)">
 	      <label for="freeamount_E" id="freeamountLabelBG">€
 	      <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
 	        onchange="freeamount_E.value=value; checkAmount(value)" onfocus="checkItE(freeamount_E.checked)">
 	      </label>
 	    </div>
 
 	    <div class="switches">
               <div class="switch-field">
                 <input type="radio" id="switch_left" name="currency_code" value="USD" onchange="currency_choice('USD')">
 	        <label for="switch_left">USD</label>
 	        <input type="radio" id="switch_right" name="currency_code" value="EUR" onchange="currency_choice('EUR')"
                     checked="checked">
 	        <label for="switch_right">EUR</label>
 	      </div>
 
               <div class="switch-field">
 	        <input type="radio" id="onetime" name="frq" checked="checked" onchange="donation_frq('onetime')">
                 <label for="onetime">einmalig</label>
 	        <input type="radio" id="monthly" name="frq" onchange="donation_frq('monthly')">
 	        <label for="monthly">monatlich</label>
 	      </div>
 	    </div>
 
 	    <div id="pay_div">
 	      <!-- list me -->
 	      <p>
 	      <label>
                 <input type="hidden"   name="on0" value="Spende und Namen veröffentlichten">
                 <input type="hidden"   name="os0" value="Nein">
                 <input type="checkbox" name="os0" value="Ja">
                 <span>Meinen Namen in die <a href="donate-de.html#sponsors">Spenderliste</a> eintragen
 		    (ab 20,- EUR).</span>
 	      </label>
 	      <input type="hidden" name="charset" value="utf-8">
 
 	      <!-- feedback -->
 	      <p>
 	      <input type="hidden" name="on1" value="Rückeldung">
 	      <input type="hidden" name="os1" value="">
 	      <textarea value=""   name="os1" placeholder="Ich benutze Gpg4win, weil ..." rows="3" cols="48"></textarea>
 
 	      <!-- pay button -->
 	      <input type="hidden" name="lc" value="DE">
 	      <input id="onetime1" name="cmd" value="_donations" type="hidden">
 	      <input id="recurrent1" name="cmd" value="_xclick-subscriptions" type="hidden" disabled>
 	      <input id="recurrent2" type="hidden" name="p3" value="1" disabled>
 	      <input id="recurrent3" type="hidden" name="t3" value="M" disabled>
 	      <input id="recurrent4" type="hidden" name="a3" value="" disabled>
 	      <input id="recurrent5" type="hidden" name="src" value="1" disabled>
 	      <input name="business" value="paypal@intevation.de" type="hidden">
 	      <input name="undefined_quantity" value="1" type="hidden">
 	      <input name="item_name" value="Gpg4win" type="hidden">
 	      <input name="no_shipping" value="1" type="hidden">
 	      <input name="no_note" value="1" type="hidden">
 	      <input name="image_url" value="https://gpg4win.org/img/logo_gpg4win_for_paypal.png" type="hidden">
 	      <input name="return" value="https://gpg4win.org/thanks-for-donation-de.html" type="hidden">
 	      <input name="cancel_return" value="https://gpg4win.org/thanks-for-download-de.html" type="hidden">
 	      <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
 	      <p id="dButton">
 	      <button class="donateButton" name="submit" alt="Spenden via PayPal"
 		  type="submit">Spenden & Herunterladen</button>
 	    </div>
 	  </form>
 
 	  <!-- download -->
 	  <div id="download_div">
 	    <p>
 	      <a href="thanks-for-download.html"><button
 class="donateButton" alt="download">Herunterladen</button></a>
 	    </p>
 	  </div>
 	</div>
       </li>
     
       <!-- bitcoin -->
       <li>
 	<input id="tab2" type="radio" value="bitcoin" name="paymethod">
 	<label for="tab2">Bitcoin</label>
 	<div id="bitcoin_tab" class="tab-content">
 	  <p>
           <img class="pay-logo" src="img/bitcoin-logo.png">
           <p>Bitcoins können Sie uns anonym an folgende Adresse spenden:</p>
           <a href="https://blockchain.info/address/1M3GipkG2YyHPDMPewqTpup83jitXvBg9N">
             1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
           </a>
           <p>
 	  <img class="qrcode" src="img/bitcoin-qrcode.png">
           <p>
 	  Nach Abschluss der Transaktion: <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a>
 	</div>
       </li>
 
       <!-- bank transfer -->
       <li>
           <input id="tab3" type="radio" value="transfer" name="paymethod" >
 	  <label for="tab3">Überweisung</label>
 	  <div id="transfer_tab" class="tab-content">
 	    <b>Spendenkonto:</b>
 	    <blockquote>
 	    Empfänger: Intevation GmbH<br>
 	    IBAN: DE33 2654 0070 0539 2006 00<br>
 	    BIC: COBADEFFXXX (Commerzbank Osnabr&uuml;ck)<br>
 	    Verwendungszweck: "Gpg4win Spende"
 	    </blockquote>
 	    <p>
-	    <a href="mailto:gpg4win-professional@intevation.de">Kontaktieren Sie uns</a>,
+	    <a href="mailto:gpg4win-professional@gpg4win.org">Kontaktieren Sie uns</a>,
 	    wenn Sie eine Rechnung benötigen (nur bei Beträgen ab 100,- EUR).
 	    <p>
 	    Nach Abschluss der Überweisung: <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a>
 	    </p>
 	  </div>
        </li>
       </ul>
 </div>
 
 <script type="text/javascript">
   document.getElementById('download_div').style.display = "none";
   document.getElementById('USD').style.display = "none";
   amountGiven = 0;
 
   function checkAmount(amount) {
     if (amount < 0 ) {
       document.getElementById('amountfield').value = 0;
       amount = 0;
     }
     if (amount == 0) {
       document.getElementById('download_div').style.display = "block";
       document.getElementById('pay_div').style.display = "none";
     }
     if (amount > 0) {
       document.getElementById('download_div').style.display = "none";
       document.getElementById('pay_div').style.display = "block";
     }
     document.getElementById('recurrent4').value = amount;
     amountGiven = amount;
   }
 
   function checkIt(checked) {
     if (!checked) {
       document.getElementById('freeamount').checked = "checked";
     }
   }
 
   function checkItE(checked) {
     if (!checked) {
       document.getElementById('freeamount_E').checked = "checked";
     }
   }
 
   function currency_choice(txt) {
     if (txt == "USD") {
       document.getElementById('USD').style.display = "block";
       document.getElementById('EUR').style.display = "none";
       for (var i = 0; i < 5; i++) {
 	    var v = document.getElementsByName('amount')[i];
 	    if (v.value == amountGiven) {
 	      v.checked = "checked";
 	    }
       }
     }
     if (txt == "EUR") {
      document.getElementById('USD').style.display = "none";
      document.getElementById('EUR').style.display = "block";
      for (var i = 5; i < 10; i++) {
 	   var v = document.getElementsByName('amount')[i];
 	     if (v.value == amountGiven) {
 	       v.checked = "checked";
    	     }
       }
     }
   }
 
   function donation_frq(txt) {
     if (txt == "onetime") {
       document.getElementById('onetime1').disabled= false;
       for (var i=1; i<6; i++) {
 	    document.getElementById('recurrent'+i).disabled= true;
       }
     }
     if (txt == "monthly") {
       document.getElementById('onetime1').disabled= true;
       for (var i=1; i<6; i++) {
 	    document.getElementById('recurrent'+i).disabled= false;
       }
     }
   }
 </script>
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index 5902ecfa..eab604ee 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -1,230 +1,230 @@
 <!-- donation form -->
 <div class="donate_box">
     <h3>Please donate for Gpg4win to support maintenance and development!</h3>
     <p>Pay what you want! – Thank you!</p>
    
     <ul class="tabs">
 
       <!-- paypal -->
       <li>
 	<p><i>Donate with</i></p>
 	<input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
 	<label for="tab1">PayPal</label>
 	<div id="paypal_tab" class="tab-content">
 	  <img class="pay-logo" src="img/paypal-logo.png">
 	  <!-- amount -->
 	  <br>
 	  <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
 
 	    <div class="amountlabel" id="USD">
 	      <input type="radio" name="amount" value="0" id="amount1" onchange="checkAmount(value)">
 	      <label for="amount1"> $0 </label>
 	      <input type="radio" name="amount" value="10" id="amount2" onchange="checkAmount(value)">
 	      <label for="amount2"> $10 </label>
 	      <input type="radio" name="amount" value="15" id="amount3" onchange="checkAmount(value)" checked="checked">
 	      <label for="amount3"> $15 </label>
 	      <input type="radio" name="amount" value="25" id="amount4" onchange="checkAmount(value)">
 	      <label for="amount4"> $25 </label>
 	      <input type="radio" name="amount" value="" id="freeamount" onchange="checkAmount(value)">
 	      <label for="freeamount" id="freeamountLabelBG">$
 	        <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
 	        onchange="freeamount.value=value; checkAmount(value)" onfocus="checkIt(freeamount.checked)">
 	      </label>
 	    </div>
 
 	    <div class="amountlabel" id="EUR">
 	      <input type="radio" name="amount" value="0" id="amount1_E" onchange="checkAmount(value)">
 	      <label for="amount1_E"> 0€ </label>
 	      <input type="radio" name="amount" value="10" id="amount2_E" onchange="checkAmount(value)">
 	      <label for="amount2_E"> 10€ </label>
 	      <input type="radio" name="amount" value="15" id="amount3_E" onchange="checkAmount(value)">
 	      <label for="amount3_E"> 15€ </label>
 	      <input type="radio" name="amount" value="25" id="amount4_E" onchange="checkAmount(value)">
 	      <label for="amount4_E"> 25€ </label>
 	      <input type="radio" name="amount" value="" id="freeamount_E" onchange="checkAmount(value)">
 	      <label for="freeamount_E" id="freeamountLabelBG">€
 	      <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
 	        onchange="freeamount_E.value=value; checkAmount(value)" onfocus="checkItE(freeamount_E.checked)">
 	      </label>
 	    </div>
 
 	    <div class="switches">
 	      <div class="switch-field">
 	        <input type="radio" id="switch_left" name="currency_code" value="USD" onchange="currency_choice('USD')"
                     checked="checked">
 	        <label for="switch_left">USD</label>
 	        <input type="radio" id="switch_right" name="currency_code" value="EUR" onchange="currency_choice('EUR')">
 	        <label for="switch_right">EUR</label>
 	      </div>
 
 	      <div class="switch-field">
 	        <input type="radio" id="onetime" name="frq" checked="checked" onchange="donation_frq('onetime')">
 	        <label for="onetime">onetime</label>
 	        <input type="radio" id="monthly" name="frq" onchange="donation_frq('monthly')">
 	        <label for="monthly">monthly</label>
 	      </div>
 	    </div>
 
 	    <div id="pay_div">
 	      <!-- list me -->
 	      <p>
 	      <label>
 	        <input type="hidden"   name="on0" value="Publish your donation and name">
 		<input type="hidden"   name="os0" value="No">
 		<input type="checkbox" name="os0" value="Yes">
 		<span>Add me to the <a href="donate.html#sponsors">list of sponsors</a>
 		    (from 20,- EUR/USD up)</span>
 	      </label>
 	      <input type="hidden" name="charset" value="utf-8">
 
 	      <!-- feedback -->
 	      <p>
 	      <input type="hidden" name="on1" value="Feedback">
 	      <input type="hidden" name="os1" value="US">
 	      <textarea value=""   name="os1" placeholder="I am using Gpg4win because ..." rows="3" cols="48"></textarea>
 
 	      <!-- pay button -->
 	      <input type="hidden" name="lc" value="US">
 	      <input id="onetime1" name="cmd" value="_donations" type="hidden">
 	      <input id="recurrent1" name="cmd" value="_xclick-subscriptions" type="hidden" disabled>
 	      <input id="recurrent2" type="hidden" name="p3" value="1" disabled>
 	      <input id="recurrent3" type="hidden" name="t3" value="M" disabled>
 	      <input id="recurrent4" type="hidden" name="a3" value="" disabled>
 	      <input id="recurrent5" type="hidden" name="src" value="1" disabled>
 	      <input name="business" value="paypal@intevation.de" type="hidden">
 	      <input name="undefined_quantity" value="1" type="hidden">
 	      <input name="item_name" value="Gpg4win" type="hidden">
 	      <input name="no_shipping" value="1" type="hidden">
 	      <input name="no_note" value="1" type="hidden">
 	      <input name="image_url" value="https://gpg4win.org/img/logo_gpg4win_for_paypal.png" type="hidden">
 	      <input name="return" value="https://gpg4win.org/thanks-for-donation.html" type="hidden">
 	      <input name="cancel_return" value="https://gpg4win.org/thanks-for-download.html" type="hidden">
 	      <input name="cbt" value="Download Gpg4win now!" type="hidden">
 	      <p id="dButton">
 	      <button class="donateButton" name="submit" alt="Donate via PayPal"
 		  type="submit">Donate & Download</button>
 	    </div>
 	  </form>
 
 	  <!-- download -->
 	  <div id="download_div">
 	    <p>
 	      <a href="thanks-for-download.html"><button class="donateButton" alt="download">Download</button></a>
 	    </p>
 	  </div>
 	</div>
       </li>
 
       <!-- bitcoin -->
       <li>
 	<input id="tab2" type="radio" value="bitcoin" name="paymethod">
 	<label for="tab2">Bitcoin</label>
 	<div id="bitcoin_tab" class="tab-content">
 	  <p>
 	  <img class="pay-logo" src="img/bitcoin-logo.png">
           <p>You can send us bitcoins anonymously to the following address:</p>
           <a href="https://blockchain.info/address/1M3GipkG2YyHPDMPewqTpup83jitXvBg9N">
 	    1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
 	  </a>
 	  <p>
 	  <img class="qrcode" src="img/bitcoin-qrcode.png">
 	  <p>
 	  After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
 	</div>
       </li>
 
       <!-- bank transfer -->
       <li>
 	<input id="tab3" type="radio" value="transfer" name="paymethod" >
 	<label for="tab3">Bank transfer</label>
 	<div id="transfer_tab" class="tab-content">
 	  <b>Bank transfer details:</b>
 	  <blockquote>
 	  Receiver: Intevation GmbH<br>
 	  IBAN: DE33 2654 0070 0539 2006 00<br>
 	  BIC: COBADEFFXXX (Commerzbank Osnabr&uuml;ck)<br>
 	  Reference: "Gpg4win donation"
 	  </blockquote>
 	  <p>
-	  Please <a href="mailto:gpg4win-professional@intevation.de">contact us</a>
+	  Please <a href="mailto:gpg4win-professional@gpg4win.org">contact us</a>
 	  if you need an invoice (for more than 100,- EUR/USD only).
 	  <p>
 	  After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
 	  </p>
 	</div>
       </li>
     </ul>
 </div>
 
 <script type="text/javascript">
   document.getElementById('download_div').style.display = "none";
   document.getElementById('EUR').style.display = "none";
   amountGiven = 15;
 
   function checkAmount(amount) {
     if (amount < 0 ) {
       document.getElementById('amountfield').value = 0;
       amount = 0;
     }
     if (amount == 0) {
       document.getElementById('download_div').style.display = "block";
       document.getElementById('pay_div').style.display = "none";
     }
     if (amount > 0) {
       document.getElementById('download_div').style.display = "none";
       document.getElementById('pay_div').style.display = "block";
     }
     document.getElementById('recurrent4').value = amount;
     amountGiven = amount;
   }
 
   function checkIt(checked) {
     if (!checked) {
       document.getElementById('freeamount').checked = "checked";
     }
   }
 
   function checkItE(checked) {
     if (!checked) {
       document.getElementById('freeamount_E').checked = "checked";
     }
   }
 
   function currency_choice(txt) {
     if (txt == "USD") {
       document.getElementById('USD').style.display = "block";
       document.getElementById('EUR').style.display = "none";
       for (var i = 0; i < 5; i++) {
 	var v = document.getElementsByName('amount')[i];
 	if (v.value == amountGiven) {
 	  v.checked = "checked";
 	}
      }
     }
     if (txt == "EUR") {
      document.getElementById('USD').style.display = "none";
      document.getElementById('EUR').style.display = "block";
      for (var i = 5; i < 10; i++) {
 	var v = document.getElementsByName('amount')[i];
 	if (v.value == amountGiven) {
 	  v.checked = "checked";
 	}
       }
     }
   }
 
   function donation_frq(txt) {
     if (txt == "onetime") {
       document.getElementById('onetime1').disabled= false;
       for (var i=1; i<6; i++) {
 	document.getElementById('recurrent'+i).disabled= true;
       }
     }
     if (txt == "monthly") {
       document.getElementById('onetime1').disabled= true;
       for (var i=1; i<6; i++) {
 	document.getElementById('recurrent'+i).disabled= false;
       }
     }
   }
 </script>
diff --git a/web/impressum-de.htm4 b/web/impressum-de.htm4
index 63360912..68897064 100644
--- a/web/impressum-de.htm4
+++ b/web/impressum-de.htm4
@@ -1,66 +1,66 @@
 m4_dnl                                                         -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`DE')
 m4_define(`EN_FILE', `impressum.html')
 
 m4_define(`TITLE', `Impressum')
 m4_define(`MAIN', `misc')
 
 PAGE_START
 
 <div id="intro">
 <h2>Impressum</h2>
 <p>
 Intevation und g10 Code sind die verantwortlichen Unternehmen für die
 Gpg4win-Entwicklung.
 Die Gpg4win Webseiten, der Downloadserver sowie die Mailinglisten und
 die Wald-Entwicklungsplattform werden von der Intevation GmbH
 bereitgestellt.
 Die inhaltliche Gestaltung erfolgte und erfolgt durch die wechselnden
 aktiven Mitglieder der Gpg4win-Initiative.
 </p>
 </div>
 
 <div id="main">
 <h2>Intevation GmbH</h2>
 <p>
 Neuer Graben 17<br>
 49074 Osnabrück<br>
 Deutschland<br>
 Web: <a href="http://www.intevation.de">www.intevation.de</a><br>
 Mail: <a
-href="mailto:gpg4win-professional@intevation.de">gpg4win-professional@intevation.de</a>
+href="mailto:gpg4win-professional@gpg4win.org">gpg4win-professional@gpg4win.org</a>
 <i>(Nur kostenpflichtiger Support!)*</i><br>
 Tel: +49 541 335083-0 <i>(Nur kostenpflichtiger Support!)*</i>
 </p>
 <p><i>*) Für kostenfreie Unterstützung nutzen
 Sie die <a href="community-de.html">Gpg4win-Gemeinschaft</a>.</i></p>
 
 <p>
 Vertretungsberechtigt: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner<br>
 Registereintrag: HR B 18998, Amtsgericht Osnabrück<br>
 Umsatzsteuer-Identifikation: de 204 854 484
 </p>
 
 <p>
 Gpg4win-Spendenmöglichkeiten unter <a
 href="donate-de.html">Spenden</a>.
 </p>
 
 
 <h2>g10 Code GmbH</h2>
 <p>
 Hüttenstr. 61<br>
 40699 Erkrath<br>
 Deutschland<br>
 <a href="http://www.g10code.com">www.g10code.com</a>
 </p>
 
 <p>
 Vertretungsberechtigt: Werner Koch<br>
 Registereintrag: HR B 14459, Amtsgericht Wuppertal<br>
 Umsatzsteuer-Identifikation: de 215605608
 </p>
 </div>
diff --git a/web/impressum.htm4 b/web/impressum.htm4
index 5218c606..b495dd7c 100644
--- a/web/impressum.htm4
+++ b/web/impressum.htm4
@@ -1,67 +1,67 @@
 m4_dnl -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`EN')
 m4_define(`DE_FILE', `impressum-de.html')
 
 m4_define(`TITLE', `Contact')
 m4_define(`MAIN', `misc')
 
 PAGE_START
 
 <div id="intro">
 <h2>Legal notice</h2>
 <p>
 Intevation and g10 Code are the companies responsible for the
 development of Gpg4win.
 The web pages, the download server as well as the mailing lists and
 the wald development platform are hosted by Intevation GmbH.
 The web content has been created and is being maintained by the changing
 active team members of the Gpg4win initiative.
 </p>
 </div>
 
 <div id="main">
 
 <h2>Intevation GmbH</h2>
 <p>
 Neuer Graben 17<br>
 49074 Osnabrück<br>
 Germany<br>
 Web: <a href="http://www.intevation.net">www.intevation.net</a><br>
 Mail: <a
-href="mailto:gpg4win-professional@intevation.de">gpg4win-professional@intevation.de</a>
+href="mailto:gpg4win-professional@gpg4win.org">gpg4win-professional@gpg4win.org</a>
 <i>(Only paid service!)*</i><br>
 Tel: +49 541 335083-0 <i>(Only paid service!)*</i>
 </p>
 <p><i>*) For free support ask the <a href="community-de.html">Gpg4win
 Community</a> please.</i></p>
 
 <p>
 Authorised: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner<br>
 Registered as: HR B 18998, Amtsgericht Osnabrück<br>
 VAT ID: de 204 854 484<br>
 </p>
 
 <p>
 For Gpg4win donation options read <a
 href="donate.html">donation page</a>.
 </p>
 
 
 <h2>g10 Code GmbH</h2>
 <p>
 Hüttenstr. 61<br>
 40699 Erkrath<br>
 Germany<br>
 <a href="http://www.g10code.com">www.g10code.com</a>
 </p>
 
 <p>
 Authorised: Werner Koch<br>
 Registered as: HR B 14459, Amtsgericht Wuppertal<br>
 VAT ID: de 215605608<br>
 </p>
 
 </div>
diff --git a/web/reporting-bugs-de.htm4 b/web/reporting-bugs-de.htm4
index e559693a..f1c6f372 100644
--- a/web/reporting-bugs-de.htm4
+++ b/web/reporting-bugs-de.htm4
@@ -1,96 +1,96 @@
 m4_dnl                                                      -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`DE')
 m4_define(`EN_FILE', `reporting-bugs.html')
 
 m4_define(`TITLE', `Probleme melden')
 m4_define(`MAIN', `community')
 
 PAGE_START
 
 <div id="intro">
 <h2>Probleme melden</h2>
 <p>Eine Anleitung</p>
 </div>
 
 <div id="main">
 
 <h2>1. Prüfen, ob man die aktuellste Version von Gpg4win verwendet</h2>
 
 <p>
 Der Download-Knopf im oberen Brereich der Gpg4win Heimatseite
 zeigt die jeweils aktuellste Version von Gpg4win an.
 </p>
 
 <p>
 Die Versionsnummer Ihrer installierten Gpg4win-Version finden Sie
 in Kleopatra unter <em>Hilfe->Über Kleopatra</em>.
 </p>
 
 
 <h2>2. Prüfen, ob das Problem bereits bekannt ist</h2>
 
 <p>
 Es ist sinnvoll, die Liste der offenen Fehler
 zu durchsuchen, ob einer dieser Einträge bereits
 das Problem beschreibt was man selbst hat.
 Dort sollte man dann seine ergänzenden Hinweise
 einfügen.
 </p>
 
 <a href="https://dev.gnupg.org/u/gpg4win">Liste der offenen Fehler</a>
 
 <h2>3. Fehlerbericht erstellen</h2>
 
 Bitte berichten Sie den Fehler in Englisch indem Sie
 <a href="https://dev.gnupg.org/maniphest/task/edit/form/5/">dieses Formular</a> verwenden.
 <br/>
 Beachten Sie dabei folgendes:
 
 <h3>3.1 Versionsnummern angeben</h3>
 
 <p>
 Ein neuer Fehlerbericht, aber auch Ergänzungen zu
 bestehenden Berichten sollten die exakte Versionsnummer
 von Windows, Gpg4win und ggf. von MS Outlook
 nennen.
 </p>
 
 <h3>3.2 Anleitung zur Reproduktion des Fehlers</h3>
 
 <p>
 Falls es möglich ist, sollte in einer Schritt-für-Schritt
 Anleitung beschrieben werden, wie man den Fehler reproduziert.
 </p>
 
 <h3>3.3 Debug Informationen hinzufügen</h3>
 
 <p>
 Falls es geht und sinnvoll erscheint,
 sollte der Bericht um ein Debug-Log ergänzt werden.
 Anleitungen für die einzelnen Gpg4win-Komponenten finden Sie im
 <a href="./doc/de/gpg4win-compendium_29.html">Gpg4win-Kompendium</a>.
 </p>
 
 <p>
 Wer sich in der Lage dazu fühlt, sollte nur die relevanten
 Informationen der Logdatei dem Fehlerbericht beilegen.
 </p>
 
 <h2>Private Berichte / Sicherheitsprobleme</h2>
 <p>
 Wenn Sie ihren Bericht nicht öffentlich machen wollen, da er
 private informationen enthält oder ein gravirendes Sicherheitsproblem
 beschreibt, können Sie unserem Team eine verschlüsselte
-Nachricht an <a href="mailto://gpg4win-professional@intevation.de">gpg4win-professional@gpg4win.org</a>
+Nachricht an <a href="mailto://gpg4win-professional@gpg4win.org">gpg4win-professional@gpg4win.org</a>
 senden.
 </p>
 
 <p>
 Der öffentliche Schlüssel für diese Adresse ist:<a
       href="gpg4win-professional-key.asc">5BFB FFC6 C040 8D5B B0C9  BDF4 6113 F899 1A8C 17A9</a>.
 </p>
 
 </div>
diff --git a/web/reporting-bugs.htm4 b/web/reporting-bugs.htm4
index 7ba856cf..117af150 100644
--- a/web/reporting-bugs.htm4
+++ b/web/reporting-bugs.htm4
@@ -1,91 +1,91 @@
 m4_dnl                                                       -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`EN')
 m4_define(`DE_FILE', `reporting-bugs-de.html')
 
 m4_define(`TITLE', `Reporting Bugs')
 m4_define(`MAIN', `community')
 
 PAGE_START
 
 <div id="intro">
 <h2>How to report a problem</h2>
 <p>Step-by-step instructions.</p>
 </div>
 
 <div id="main">
 <h2>1. Check whether you are using the latest version of Gpg4win</h2>
 
 <p>
 The download button on top of the Gpg4win homepage shows
 the current version.
 </p>
 
 <p>
 You can find your installed Gpg4win version number
 in Kleopatra under <em>Help->About Kleopatra</em>.
 </p>
 
 <h2>2. Check whether the problem is already reported</h2>
 
 <p>
 Search through the list of open bugs and try to
 identify whether one of the entries already describes
 your problem. Add your additional comments there.
 </p>
 
 <a href="https://dev.gnupg.org/u/gpg4win">List of open issues</a>
 
 <h2>3. Create a new report</h2>
 
 Please report the problem using
 <a href="https://dev.gnupg.org/maniphest/task/edit/form/5/">this form</a>.
 <br/>
 Please note the following:
 
 <h3>3.1 Provide version numbers</h3>
 
 <p>
 If you report a new bug or add comments to an existing
 bug report, describe the exact version of the Windows System,
 Gpg4win and, if appropriate, of MS Office and Outlook.
 </p>
 
 <h3>3.2 Notes on how to reproduce the bug</h3>
 
 <p>
 If possible provide a step by step method
 on how you can reproduce the bug.
 </p>
 
 <h3>3.3 Add debug information</h3>
 
 <p>
 If appropriate, attach a debug log of the
 procedure where you produced the bug.
 Look at the instructions for the several Gpg4win components in the
 <a href="./doc/en/gpg4win-compendium_29.html">Gpg4win Compendium</a>.
 
 </p>
 
 <p>
 If you feel able to, just send an excerpt with the relevant
 information.
 </p>
 
 
 <h2>Private reports / security issues</h2>
 <p>
 If you do not want to publicly divulge the contents of a report,
 e.g. because that would leak private information or if you consider
 an issue a severe security problem, you can send an encrypted mail
-to our professional team at <a href="mailto://gpg4win-professional@intevation.de">gpg4win-professional@gpg4win.org</a>.
+to our professional team at <a href="mailto://gpg4win-professional@gpg4win.org">gpg4win-professional@gpg4win.org</a>.
 </p>
 <p>
 The public key for this address is <a
       href="gpg4win-professional-key.asc">5BFB FFC6 C040 8D5B B0C9  BDF4 6113 F899 1A8C 17A9</a>.
 </p>
 
 </div>