diff --git a/ChangeLog b/ChangeLog
index 753fde54c..54395d776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Templates/MailerUI/UIxMailView.wox: don't display useless
+	headers (should be made configurable at some point)...
+
 	* OGoContentStore/sql/generate-folderinfo-sql-for-users.sh: drop
 	"not null" constraint on startdate, enddate, isopaque,
 	participants and partmails.
diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index a4de6de3a..dd4f45e20 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -77,81 +77,6 @@
           </tr>
         </var:if>
 
-        <!-- header fields if available -->
-        <var:if condition="clientObject.hasMailHeaderInCoreInfos">
-
-          <var:if condition="clientObject.mailHeaders.organization.isNotEmpty">
-            <tr class="mailer_fieldrow">
-              <td class="mailer_fieldname" 
-                ><var:string label:value="Organization"/>:</td>
-              <td class="mailer_fieldvalue">
-                <var:if-qualifier
-                  const:condition="organization hasPrefix: 'http://'" 
-                  object="clientObject.mailHeaders">
-                  <a var:href="clientObject.mailHeaders.organization"
-                    var:string="clientObject.mailHeaders.organization" />
-                </var:if-qualifier>
-                <var:if-qualifier
-                  const:condition="organization hasPrefix: 'http://'" 
-                  object="clientObject.mailHeaders"
-                  const:negate="YES">
-                  <var:string value="clientObject.mailHeaders.organization" />
-                </var:if-qualifier>
-              </td>
-            </tr>
-          </var:if>
-          
-          <var:if condition="clientObject.mailHeaders.list-id.isNotEmpty">
-            <tr class="mailer_fieldrow">
-              <td class="mailer_fieldname" 
-                ><var:string label:value="Mailinglist"/>:</td>
-              <td class="mailer_fieldvalue">
-                <a var:href="clientObject.mailingListArchiveURL"
-                  target="_blank"
-                  var:string="clientObject.mailHeaders.list-id" />
-                |
-                <a var:href="clientObject.mailingListSubscribeURL"
-                  target="_blank"><var:string label:value="subscribe"/></a>
-                |
-                <a var:href="clientObject.mailingListUnsubscribeURL"
-                  target="_blank"><var:string label:value="unsubscribe"/></a>
-              </td>
-            </tr>
-          </var:if>
-          
-          <var:if condition="clientObject.mailHeaders.x-virus-status.isNotEmpty">
-            <tr class="mailer_fieldrow">
-              <td class="mailer_fieldname" 
-                ><var:string label:value="Virusstatus"/>:</td>
-              <td class="mailer_fieldvalue">
-                <var:string value="clientObject.mailHeaders.x-virus-status" />
-              </td>
-            </tr>
-          </var:if>
-
-          <var:if condition="clientObject.mailHeaders.x-spam-level.isNotEmpty">
-            <tr class="mailer_fieldrow">
-              <td class="mailer_fieldname" 
-                ><var:string label:value="Spamlevel"/>:</td>
-              <td class="mailer_fieldvalue">
-                <var:string value="clientObject.mailHeaders.x-spam-level" />
-                <var:if condition="clientObject.mailHeaders.x-spam-flag"
-                  const:value="YES">
-                  / <var:string label:value="marked as spam by mailserver" />
-                </var:if>
-              </td>
-            </tr>
-          </var:if>
-          
-          <!-- all headers
-          <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname" ><var:string label:value="Header"/>:</td>
-          <td class="mailer_fieldvalue">
-          <pre><var:string value="clientObject.mailHeaders" /></pre>
-        </td>
-        </tr>
-          -->
-        </var:if>
       </table>
     </var:if><!-- !Kolab -->