diff --git a/hosts/vm/mediakiwi/default.nix b/hosts/vm/mediakiwi/default.nix
index da91291..0dac7f5 100644
--- a/hosts/vm/mediakiwi/default.nix
+++ b/hosts/vm/mediakiwi/default.nix
@@ -6,6 +6,7 @@
     ./networking.nix
 
     ../../../modules
+    ../../../modules/crans/nullmailer.nix
     ../../../modules/services/mediawiki.nix
   ];
 
diff --git a/modules/crans/nullmailer.nix b/modules/crans/nullmailer.nix
new file mode 100644
index 0000000..23bb4ef
--- /dev/null
+++ b/modules/crans/nullmailer.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  services.nullmailer = {
+    enable = true;
+
+    config = {
+      remotes = ''
+        smtp.adm.crans.org smtp
+      '';
+      adminaddr = "root@crans.org";
+      defaulthost = "crans.org";
+      allmailfrom = "root@crans.org";
+    };
+  };
+}
diff --git a/modules/services/mediawiki.nix b/modules/services/mediawiki.nix
index 2a8a39f..ceaa59d 100644
--- a/modules/services/mediawiki.nix
+++ b/modules/services/mediawiki.nix
@@ -23,15 +23,42 @@ in
     passwordFile = config.age.secrets.mediawiki-admin-passwd.path;
 
     extraConfig = ''
-      # Server Settings
+      # Server settings
       $wgFavicon = 'https://www.crans.org/images/favicon.ico';
       $wgLogo = 'https://www.crans.org/images/crans.svg';
 
-      # contact info
+      # E-mail settings
+      $wgEnableEmail = true;
+      # $wgSMTP = [
+      #   'host'      => 'smtp.adm.crans.org',
+      #   'IDHost'    => 'crans.org',
+      #   'localhost' => 'crans.org',
+      #   'port'      => ,
+      #   'auth'      => false,
+      #   # 'username'  => ,
+      #   # 'password'  => ,
+      # ];
+      $wgPasswordSender = 'root@crans.org';
       $wgEmergencyContact = 'contact@crans.org';
+      $wgNoReplyAddress = 'root@crans.org';
+      $wgEnableUserEmail = true;
+      $wgEnableSpecialMute = true;
+      $wgAllowHTMLEmail = true;
+
+      $wgEnotifUseRealName = false;
+      $wgEnotifFromEditor = false;
+      $wgEnotifRevealEditorAddress = false;
+      $wgEnotifUserTalk = true;
+      $wgEnotifMinorEdits = true;
+      $wgEnotifWatchlist = true;
+      # Peut-être utilisé pour les Wikistes
+      $wgUsersNotifiedOnAllChanges = [];
     
-      # default theme
+      # Theme
       $wgDefaultSkin = 'citizen';
+      $wgCitizenThemeColor = '#AD1F1F';
+      $wgCitizenEnableARFonts = true;
+      $wgCitizenEnableCJKFonts = true;
 
       $wgLanguageCode = 'fr';
 
@@ -40,6 +67,12 @@ in
 
       # Extensions
       $wgWikiEditorRealtimePreview = true;
+
+      # Debug
+      # $wgShowExceptionDetails = true;
+      $wgDebugToolbar = true;
+      # $wgShowDebug = true;
+      # $wgDevelopmentWarnings = true;
     '';
 
     skins = {