2 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 9f8453a6c63..86e6873f4b4 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -2,12 +2,15 @@
 , sslSupport ? true
 , imapSupport ? true
 , headerCache ? true
+, saslSupport ? true
 , gdbm ? null
 , openssl ? null
+, cyrus_sasl ? null
 }:
 
 assert headerCache -> gdbm != null;
 assert sslSupport -> openssl != null;
+assert saslSupport -> cyrus_sasl != null;
 
 stdenv.mkDerivation {
   name = "mutt-1.5.20";
@@ -19,12 +22,18 @@ stdenv.mkDerivation {
     ncurses which perl
     (if headerCache then gdbm else null)
     (if sslSupport then openssl else null)
+    (if saslSupport then cyrus_sasl else null)
   ];
   configureFlags = [
-    "--with-mailpath="
+    "--with-mailpath=" "--enable-smtp"
+    # The next allows building mutt without having anything setgid
+    # set by the installer, and removing the need for the group 'mail'
+    # I set the value 'mailbox' because it is a default in the configure script
+    "--with-homespool=mailbox"
     (if headerCache then "--enable-hcache" else "--disable-hcache")
     (if sslSupport then "--with-ssl" else "--without-ssl")
     (if imapSupport then "--enable-imap" else "--disable-imap")
+    (if saslSupport then "--with-sasl" else "--without-imap")
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
index 101caa6825d..619c1e44ab4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@@ -10,14 +10,14 @@
     
 }:
 
-let version = "3.0"; in
+let version = "3.0.4"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "7a8a08f011901b4c0b737de2d7a226242935543d";
+    sha1 = "5a6e89096da61a520e5cecb61f8afeb981f90412";
   };
 
   buildInputs =