diff --git a/mailserver.nix b/mailserver.nix
index 867916b..6e136f3 100644
--- a/mailserver.nix
+++ b/mailserver.nix
@@ -15,7 +15,7 @@ in
   networking.domain = "hamburg.freifunk.net";
   services.mymailserver = {
     enable = true;
-    logging = false;
+    logging = true;
     adminAddress = "postmaster@mail.hamburg.freifunk.net";
     mailFQDN = "mail2.hamburg.freifunk.net";
   };
diff --git a/nixos-mailserver/dovecot.nix b/nixos-mailserver/dovecot.nix
index 8e02134..cc0eb91 100644
--- a/nixos-mailserver/dovecot.nix
+++ b/nixos-mailserver/dovecot.nix
@@ -118,6 +118,10 @@ let
   '';
 in
 {
+  # Configure certificates...
+  environment.systemPackages = [
+          pkgs.dovecot_pigeonhole
+  ];
   # Configure certificates...
   security.acme.certs."dovecot2.${config.services.mymailserver.mailFQDN}" = {
     domain = "${config.services.mymailserver.mailFQDN}";
@@ -133,7 +137,7 @@ in
   services.dovecot2 = {
     enable = true;
     configFile = "${dovecotConf}";
-    modules = [ pkgs.dovecot_pigeonhole ];
+    #modules = [ pkgs.dovecot_pigeonhole ];
   };
   systemd.services."vmail-setup" = {
     serviceConfig.Type = "oneshot";
diff --git a/nixos-mailserver/pkg-postfixadmin.nix b/nixos-mailserver/pkg-postfixadmin.nix
index 5a59966..10c4449 100644
--- a/nixos-mailserver/pkg-postfixadmin.nix
+++ b/nixos-mailserver/pkg-postfixadmin.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Postfix Admin";
-    homepage    = http://postfixadmin.sourceforge.net/;
+    homepage    = "http://postfixadmin.sourceforge.net/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ tokudan ];
     platforms   = platforms.all;