diff --git a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/75FixSOGoHeadersCase b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/75FixSOGoHeadersCase
new file mode 100644
index 0000000..0390592
--- /dev/null
+++ b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/75FixSOGoHeadersCase
@@ -0,0 +1 @@
+fix_headers_case
diff --git a/root/usr/share/qpsmtpd/plugins/fix_headers_case b/root/usr/share/qpsmtpd/plugins/fix_headers_case
new file mode 100644
index 0000000..83bf0af
--- /dev/null
+++ b/root/usr/share/qpsmtpd/plugins/fix_headers_case
@@ -0,0 +1,52 @@
+#!/usr/bin/perl -wT
+=head1 NAME
+
+fix_headers_case
+
+=head1 DESCRIPTION
+
+SOGo adds lower case headers, which some mail servers do not like.
+This plugin just rewrite them to have the first letter uppercase
+
+=head1 AUTHOR
+
+Daniel Berteaud <daniel@firewall-services.com>
+
+=head1 LICENSE
+
+GNU GPL (GNU General Public License)
+
+
+=cut
+
+
+sub register {
+  my ($self, $qp, %arg) = @_;
+  $self->register_hook("data_post", "fix_headers_case");
+}
+
+
+sub fix_headers_case {
+  my ($self, $transaction) = @_;
+  my $mailer = $self->get_header($transaction,'User-Agent') or return DECLINED;
+  $mailer =~ m/^SOGoMail/ or return DECLINED;
+  $self->log(LOGINFO, "SOGo mailer detected, going to fix headers case");
+  foreach my $header (qw/From To Cc Subject Message-ID Content-Type Date Content-Length Content-Transfer-Encoding/){
+    my $value = $self->get_header($transaction,$header) or return DECLINED;
+    $self->set_header($transaction, $header, $value);
+  }
+  return DECLINED;
+}
+
+sub get_header {
+  my ($self, $transaction, $header) = @_;
+  my $ret  = $transaction->header->get($header) or return;
+  return $ret;
+}
+
+sub set_header {
+    my ($self, $transaction, $header, $value) = @_;
+    my $ret = $transaction->header->delete($header) or return;
+    $ret = $transaction->header->add($header, $value) or return;
+    return $ret;
+}