selwin · selwin · Aug 8, 2016 · Jul 31, 2016
diff --git a/user_agents/parsers.py b/user_agents/parsers.py
@@ -73,6 +73,24 @@
    'Kindle Fire',
 )

+EMAIL_PROGRAM_FAMILIES = {
+    'Outlook',
+    'Windows Live Mail',
+    'AirMail',
+    'Apple Mail',
+    'Outlook',
+    'Thunderbird',
+    'Lightning',
+    'ThunderBrowse',
+    'Windows Live Mail',
+    'The Bat!',
+    'Lotus Notes',
+    'IBM Notes',
+    'Barca',
+    'MailBar',
+    'kmail2',
+    'YahooMobileMail'
+}

 def parse_version(major=None, minor=None, patch=None, patch_minor=None):
    # Returns version number tuple, attributes will be integer if they're numbers
@@ -235,6 +253,11 @@ def is_pc(self):
    def is_bot(self):
        return True if self.device.family == 'Spider' else False

+    @property
+    def is_email_client(self):
+        if self.browser.family in EMAIL_PROGRAM_FAMILIES:
+            return True
+        return False

 def parse(user_agent_string):
    return UserAgent(user_agent_string)
diff --git a/user_agents/tests.py b/user_agents/tests.py
@@ -28,6 +28,8 @@
 google_bot_ua_string = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
 nokia_n97_ua_string = 'Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/12.0.024; Profile/MIDP-2.1 Configuration/CLDC-1.1; en-us) AppleWebKit/525 (KHTML, like Gecko) BrowserNG/7.1.12344'
 android_firefox_aurora_ua_string = 'Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0'
+thunderbird_ua_string = 'Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 Lightning/4.0.2'
+outlook_usa_string = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; Microsoft Outlook 15.0.4420)'

 iphone_ua = parse(iphone_ua_string)
 ipad_ua = parse(ipad_ua_string)
@@ -50,6 +52,8 @@
 google_bot_ua = parse(google_bot_ua_string)
 nokia_n97_ua = parse(nokia_n97_ua_string)
 android_firefox_aurora_ua = parse(android_firefox_aurora_ua_string)
+thunderbird_ua = parse(thunderbird_ua_string)
+outlook_ua = parse(outlook_usa_string)


 class UserAgentsTest(unittest.TestCase):
@@ -183,6 +187,26 @@ def test_is_bot(self):
        self.assertFalse(nokia_n97_ua.is_bot)
        self.assertFalse(android_firefox_aurora_ua.is_bot)

+    def test_is_email_client(self):
+        self.assertTrue(thunderbird_ua.is_email_client)
+        self.assertTrue(outlook_ua.is_email_client)
+        self.assertFalse(playbook_ua.is_email_client)
+        self.assertFalse(kindle_fire_ua.is_email_client)
+        self.assertFalse(nexus_7_ua.is_email_client)
+        self.assertFalse(windows_phone_ua.is_email_client)
+        self.assertFalse(blackberry_bold_touch_ua.is_email_client)
+        self.assertFalse(blackberry_torch_ua.is_email_client)
+        self.assertFalse(blackberry_bold_ua.is_email_client)
+        self.assertFalse(j2me_opera_ua.is_email_client)
+        self.assertFalse(mac_safari_ua.is_email_client)
+        self.assertFalse(windows_ie_ua.is_email_client)
+        self.assertFalse(ubuntu_firefox_ua.is_email_client)
+        self.assertFalse(ie_touch_ua.is_email_client)
+        self.assertFalse(ie_ua.is_email_client)
+        self.assertFalse(nokia_n97_ua.is_email_client)
+        self.assertFalse(android_firefox_aurora_ua.is_email_client)		
+
+
    def test_strings(self):
        self.assertEqual(str(iphone_ua), "iPhone / iOS 5.1 / Mobile Safari 5.1")
        self.assertEqual(str(ipad_ua), "iPad / iOS 3.2 / Mobile Safari 4.0.4")