From 9c7ea6b73afdbd6572e091eba08dbba1afffa3fa Mon Sep 17 00:00:00 2001
From: Juan Tejada <juans.tejada@gmail.com>
Date: Mon, 2 May 2016 12:45:54 -0700
Subject: [PATCH] fix(mail-merge): Add check for valid email address in
 recipients

---
 src/flux/models/contact.coffee | 3 +++
 src/pro                        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/flux/models/contact.coffee b/src/flux/models/contact.coffee
index 78fbda038..9ee8d0ba9 100644
--- a/src/flux/models/contact.coffee
+++ b/src/flux/models/contact.coffee
@@ -91,6 +91,9 @@ class Contact extends Model
     json['name'] ||= json['email']
     json
 
+  isValid: ->
+    @email.match(RegExpUtils.emailRegex()) != null
+
   # Public: Returns true if the contact is the current user, false otherwise.
   # You should use this method instead of comparing the user's email address to
   # the account email, since it is case-insensitive and future-proof.
diff --git a/src/pro b/src/pro
index c62ed6110..6db7b64bf 160000
--- a/src/pro
+++ b/src/pro
@@ -1 +1 @@
-Subproject commit c62ed6110a8c161c838188019c8d33273a129c50
+Subproject commit 6db7b64bf05a59c2ab7f66b032065d17ebc82a5c