diff --git a/Makefile b/Makefile
index a66fc96..77a564a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
 all:
-	QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::2525-:25" NIX_PATH=nixpkgs=/home/onny/projects/nixpkgs nixos-shell vm-nextcloud.nix
+	QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" NIX_PATH=nixpkgs=/home/onny/projects/nixpkgs nixos-shell vm-nextcloud.nix
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index 0db8247..5878421 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -3,7 +3,8 @@
   nixpkgs = {
     overlays = [
       (self: super: {
-        # Remove first run wizard from Nextcloud package
+        # Remove first run wizard and password policy check from Nextcloud
+        # package
         nextcloud25 = super.nextcloud25.overrideAttrs (oldAttrs: rec {
           installPhase = oldAttrs.installPhase + ''
             rm -r $out/apps/firstrunwizard
@@ -14,6 +15,7 @@
     ];
   };
 
+  # Setup Nextcloud including apps
   services.nextcloud = {
     enable = true;
     package = pkgs.nextcloud25;
@@ -33,20 +35,27 @@
       };
       mail = pkgs.nextcloud25Packages.apps.mail;
     };
+    extraOptions = {
+      mail_smtpmode = "sendmail";
+      mail_sendmailmode = "pipe";
+    };
   };
 
+  # Setup mail server
   services.maddy = {
     enable = true;
     hostname = "localhost";
     primaryDomain = "localhost";
   };
 
+  # Configure local mail delivery
   programs.msmtp = {
     enable = true;
     accounts.default = {
       host = "localhost";
-      tls = false;
       port = 587;
+      auth = "login";
+      tls = "off";
       from = "admin@localhost";
       user = "admin@localhost";
       password = "test123";