diff --git a/Windows/lazagne/config/manage_modules.py b/Windows/lazagne/config/manage_modules.py
index d25bb6a8..614ac120 100755
--- a/Windows/lazagne/config/manage_modules.py
+++ b/Windows/lazagne/config/manage_modules.py
@@ -3,6 +3,9 @@
 from lazagne.softwares.browsers.chromium_browsers import chromium_browsers
 from lazagne.softwares.browsers.firefox_browsers import firefox_browsers
 
+# mails
+from lazagne.softwares.mails.thunderbird_mails import thunderbird_mails
+
 
 def get_modules_names():
     return [
@@ -27,7 +30,6 @@ def get_modules_names():
         ("lazagne.softwares.git.gitforwindows", "GitForWindows"),
 # Mails
         ("lazagne.softwares.mails.outlook", "Outlook"),
-        ("lazagne.softwares.mails.thunderbird", "Thunderbird"),
 # Maven
         ("lazagne.softwares.maven.mavenrepositories", "MavenRepositories"),
 # Memory
@@ -101,4 +103,4 @@ def get_categories():
 
 def get_modules():
     modules = [soft_import(package_name, module_name)() for package_name, module_name in get_modules_names()]
-    return modules + chromium_browsers + firefox_browsers
+    return modules + chromium_browsers + firefox_browsers + thunderbird_mails
diff --git a/Windows/lazagne/softwares/browsers/mozilla.py b/Windows/lazagne/softwares/browsers/mozilla.py
index efcfcfe9..c18ae43d 100755
--- a/Windows/lazagne/softwares/browsers/mozilla.py
+++ b/Windows/lazagne/softwares/browsers/mozilla.py
@@ -74,9 +74,9 @@ def long_to_bytes(n, blocksize=0):
 
 class Mozilla(ModuleInfo):
 
-    def __init__(self, browser_name, path):
+    def __init__(self, browser_name, path, category='browsers'):
         self.path = path
-        ModuleInfo.__init__(self, browser_name, category='browsers')
+        ModuleInfo.__init__(self, browser_name, category=category)
 
     def get_firefox_profiles(self, directory):
         """
diff --git a/Windows/lazagne/softwares/mails/thunderbird.py b/Windows/lazagne/softwares/mails/thunderbird.py
deleted file mode 100755
index 9a58adf5..00000000
--- a/Windows/lazagne/softwares/mails/thunderbird.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from lazagne.config.module_info import ModuleInfo
-from lazagne.softwares.browsers.mozilla import Mozilla
-
-
-class Thunderbird(Mozilla):
-
-    def __init__(self):
-        self.path = u'{APPDATA}\\Thunderbird'
-        ModuleInfo.__init__(self, 'Thunderbird', 'mails')
diff --git a/Windows/lazagne/softwares/mails/thunderbird_mails.py b/Windows/lazagne/softwares/mails/thunderbird_mails.py
new file mode 100755
index 00000000..d655f3a9
--- /dev/null
+++ b/Windows/lazagne/softwares/mails/thunderbird_mails.py
@@ -0,0 +1,13 @@
+from lazagne.config.soft_import_module import soft_import
+
+mozilla_module_location = "lazagne.softwares.browsers.mozilla", "Mozilla"
+Mozilla = soft_import(*mozilla_module_location)
+
+# Name, path
+thunderbird_mails = [
+    (u'epyrus', u'{APPDATA}\\athenian200\\Epyrus'),
+    (u'interlink', u'{APPDATA}\\BinaryOutcast\\Interlink'),
+    (u'thunderbird', u'{APPDATA}\\Thunderbird'),
+]
+
+thunderbird_mails = [Mozilla(browser_name=name, path=path, category='mails') for name, path in thunderbird_mails]