diff --git a/messageviewer/src/messagepartthemes/default/templates/htmlmessagepart.html b/messageviewer/src/messagepartthemes/default/templates/htmlmessagepart.html
index ea28833f..f10c856d 100644
--- a/messageviewer/src/messagepartthemes/default/templates/htmlmessagepart.html
+++ b/messageviewer/src/messagepartthemes/default/templates/htmlmessagepart.html
@@ -1,22 +1,22 @@
 {% if not block.isPrinting %}
 {% if not block.htmlMail or not block.loadExternal and block.containsExternalReferences %}
     <div class="htmlWarn">
         {% if not block.htmlMail %}
-            {% i18nc_var "@info" "<emphasis strong='true'>Note:</emphasis> This is an HTML message. For security reasons, only the raw HTML code is shown. If you trust the sender of this message then you can activate formatted HTML display for this message <link url='kmail:showHTML'>by clicking here</link>." as msg %}
+            {% i18n_var "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML code is shown. If you trust the sender of this message then you can activate formatted HTML display for this message <a href='kmail:showHTML'>by clicking here</a>." as msg %}
         {% elif not block.loadExternal and block.containsExternalReferences %}
-            {% i18nc_var "@info" "<emphasis strong='true'>Note:</emphasis> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <link url='kmail:loadExternal'>by clicking here</link>." as msg %}
+            {% i18n_var "<b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href='kmail:loadExternal'>by clicking here</a>." as msg %}
         {% endif %}
         {{ msg|safe }}
     </div>
     <br />
     <br />
 {% endif %}
 {% endif %}
 
 {% if not block.htmlMail %}
     {{ plaintext|safe }}
 {% else %}
     <div style="position: relative">
         {{ content|safe }}
     </div>
 {% endif %}
diff --git a/messageviewer/src/messagepartthemes/default/templates/signedmessagepart.html b/messageviewer/src/messagepartthemes/default/templates/signedmessagepart.html
index 33d8de09..9f22a73a 100644
--- a/messageviewer/src/messagepartthemes/default/templates/signedmessagepart.html
+++ b/messageviewer/src/messagepartthemes/default/templates/signedmessagepart.html
@@ -1,168 +1,168 @@
 <table cellspacing="1" cellpadding="1" class="{{block.signClass}}">
     <tr class="{{block.signClass}}H">
         <td dir="{{block.dir}}">
         {% if block.inProgress %}
             {% i18n "Please wait while the signature is being verified..." %}
         {% else %}
             <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                 {% if block.isSMIME and block.detailHeader %}
                     <td rowspan="2">
                     {% if block.technicalProblem %}
                         {{block.errorText|safe}}
                     {% elif block.showKeyInfos %}
                         {% if block.cannotCheckSignature %}
                             {% i18n_var "Not enough information to check signature. %1" block.keyWithWithoutURL as signed %}
                             {{signed|safe}}
                         {% else %}
                             {% if not block.keyId %}
                                 {% if block.signer and block.onlyShowKeyURL %}
                                     {% i18n "Message was signed by %1." block.signer %}
                                 {% else %}
                                     {% i18n "Message was signed with unknown key." %}
                                 {% endif %}
                             {% else %}
                                 {% if block.creationTime %}
                                     {% if block.signer %}
                                         {% if block.onlyShowKeyURL %}
                                             {% i18n_var "Message was signed with key %1." block.keyWithWithoutURL as signed %}
                                             {{signed|safe}}
                                         {% else %}
                                             {% i18n_var "Message was signed by %3 on %1 with key %2" block.creationTime block.keyWithWithoutURL block.signer as signed %}
                                             {{signed|safe}}
                                         {% endif %}
                                     {% else %}
                                         {% if block.onlyShowKeyURL %}
                                             {% i18n_var "Message was signed with key %1." block.keyWithWithoutURL as signed %}
                                             {{signed|safe}}
                                         {% else %}
                                             {% i18n_var "Message was signed on %1 with key %2." block.creationTime block.keyWithWithoutURL as signed %}
                                             {{signed|safe}}
                                         {% endif %}
                                     {% endif %}
                                 {% else %}
                                     {% if block.signer and block.onlyShowKeyURL %}
                                         {% i18n_var "Message was signed by %2 with key %1." block.keyWithWithoutURL block.signer as signed %}
                                         {{signed|safe}}
                                     {% else %}
                                         {% i18n_var "Message was signed with key %1." block.keyWithWithoutURL as signed %}
                                         {{signed|safe}}
                                     {% endif %}
                                 {% endif %}
                             {% endif %}
                         {% endif %}
                         <br />
                         {% if block.statusStr %}
                             &nbsp;<br />
                             {% i18n "Status: " %}
                             <i>{{block.statusStr|safe}}</i>
                             {% if block.greenCaseWarning %}
                                 <br />&nbsp;
                                 <br />
                                 {{block.greenCaseWarning|safe}}
                             {% endif %}
                         {% else %}
                             {{block.greenCaseWarning|safe}}
                         {% endif %}
                     {% else %}
                         <i>{{block.statusStr}}</i>
                     {% endif %}
                     </td>
                     <td align="right" valign="top" nowrap="nowrap"><a href="kmail:hideSignatureDetails">{% i18n "Hide Details" %}</a></td>
                 </tr>
                 <tr>
                     <td align="right" valign="bottom" nowrap="nowrap">{{block.auditlog}}</td>
                 {% elif block.detailHeader %}
                     <td rowspan="2">
                     {% if block.signClass == "signWarn" %}
                             {% if block.technicalProblem %}
                                 {{block.errorText|safe}}
                             {% else %}
                             {% if block.keyId %}
                                 {% if block.creationTime %}
                                     {% i18n_var "Message was signed on %1 with unknown key %2." block.creationTime block.keyWithWithoutURL as signed %}
                                     {{signed|safe}}
                                 {% else %} 
                                     {% i18n_var "Message was signed with unknown key %1." block.keyWithWithoutURL as signed %}
                                     {{signed|safe}}
                                 {% endif %}
                             {% else %}
                                 {% i18n "Message was signed with unknown key." %}
                             {% endif %}
                             <br />
                             {% i18n "The validity of the signature cannot be verified." %}
                             {% if block.statusStr %}
                                 <br />
                                 {% i18n "Status: " %}
                                 <i>{{block.statusStr|safe}}</i>
                             {% endif %}
                         {% endif %}
                     {% else %}
                         {% if block.isGoodSignature %}
                             {% if block.keyId %}
                                 {% i18n_var "Message was signed by %2 (Key ID: %1)." block.keyWithWithoutURL block.signer as signed %}
                                 {{signed|safe}}
                             {% else %}
                                 {% i18n "Message was signed by %1." block.signer %}
                             {% endif %}
                             <br />
                             {% if block.keyTrust == "unknown" %}
                                 {% i18n "The signature is valid, but the key's validity is unknown." %}
                             {% elif block.keyTrust == "marginal" %}
                                 {% i18n "The signature is valid and the key is marginally trusted." %}
                             {% elif block.keyTrust == "full" %}
                                 {% i18n "The signature is valid and the key is fully trusted." %}
                             {% elif block.keyTrust == "ultimate" %}
                                 {% i18n "The signature is valid and the key is ultimately trusted." %}
                             {% else %}
                                 {% i18n "The signature is valid, but the key is untrusted." %}
                             {% endif %}
                         {% else %}
                             {% if block.keyId %}
                                 {% i18n_var "Message was signed by %2 (Key ID: %1)." block.keyWithWithoutURL block.signer as signed %}
                                 {{signed|safe}}
                             {% else %}
                                 {% i18n "Message was signed by %1." block.signer %}
                             {% endif %}
                             <br />
                             {% i18n "Warning: The signature is bad." %}
                         {% endif %}
                     {% endif %}
                     </td>
                     <td align="right" valign="top" nowrap="nowrap"><a href="kmail:hideSignatureDetails">{% i18n "Hide Details" %}</a></td>
                 </tr>
                 <tr>
                     <td align="right" valign="bottom" nowrap="nowrap">{{block.auditlog}}</td>
                 {% else %}
                     <td>
                     {% if block.signClass == "signErr" %}
                         {% i18n "Invalid signature." %}
                     {% elif block.signClass == "signOkKeyBad" or block.signClass == "signWarn" %}
                         {% i18n "Not enough information to check signature validity." %}
                     {% elif block.signClass == "signOkKeyOk" %}
                         {% if block.addr %}
-                            {% i18nc_var "@info" "Signed by <link url='mailto:%1'>%1</link>." block.addr as signed %}
+                            {% i18n_var "Signed by <a href='mailto:%1'>%1</a>." block.addr as signed %}
                             {{ signed|safe }}
                         {% else %}
                             {% i18n "Signature is valid." %}
                         {% endif %}
                     {% else %}
                         {% i18n "Unknown signature state" %}
                     {% endif %}
                     </td>
                     {% if not block.printing %}
                         <td align="right"><a href="kmail:showSignatureDetails">{% i18n "Show Details" %}</a></td>
                     {% endif %}
                 {% endif %}
                 </tr>
             </table>
         {% endif %}
         </td>
     </tr>
     <tr class="{{block.signClass}}B">
         <td>{{content|safe}}</td>
     </tr>
     <tr class="{{block.signClass}}H">
         <td dir="{{block.dir}}">{% i18n "End of signed message" %}</td>
     </tr>
 </table>