diff --git a/docs/Email_user_manual.txt b/docs/Email_user_manual.txt
index edcdfd99..3b41b93f 100644
--- a/docs/Email_user_manual.txt
+++ b/docs/Email_user_manual.txt
@@ -1,4 +1,4 @@
-EMAIL HANDLING DOC		Started: 2012-12-23	Updated: 2020-02-10
+EMAIL HANDLING DOC		Started: 2012-12-23	Updated: 2021-03-28
 
 (example of how to set up an email account with Gmail is at the bottom)
 
@@ -223,7 +223,10 @@ for when you set up the email account in Vicidial.
 
 With Gmail, the recommended email account protocol is IMAP and the email account 
 server for this is "imap.gmail.com" – this information will also be used during 
-the account setup in Vicidial.
+the account setup in Vicidial. Gmail has more recently set a maximum email 
+frequency checking limit by outside applications of no more than once per 10 
+minutes, so you may want to confirm that your VICIdial Email Accounts "Frequency
+Check Rate" setting is set to 10 or higher.
 
 You can also use POP3 protocol with Gmail.  For that, the email account server 
 is pop.gmail.com.  However, when the POP3 protocol is being used on an account, 
@@ -238,6 +241,10 @@ that you may need to modify to ensure that VICIdial has access to your mailbox.
 You may need to go into your Google Account "Security "settings and enable the
 "Less secure app access" setting in order to use the IMAP connection for email.
 
+You may also need to manually verify access a second time through Google logging
+in as the user through a web browser to get VICIdial to be able to log in 
+successfully.
+
 
 NOTES:
 
diff --git a/docs/WEBSOCKETS_SUPPORT.txt b/docs/WEBSOCKETS_SUPPORT.txt
index ca483a0f..fab20d22 100644
--- a/docs/WEBSOCKETS_SUPPORT.txt
+++ b/docs/WEBSOCKETS_SUPPORT.txt
@@ -1,10 +1,10 @@
-WEBSOCKETS DOC	Started: 2018-02-23	Updated: 2020-08-26
+WEBSOCKETS DOC			Started: 2018-02-23	Updated: 2021-03-27
 
 
 
 This document will go over how we have helped clients integrate with WebSockets-based applications through the VICIdial agent screen.
 
-Support for WebSocket applications was added to the agent screen on 2018-04-25(svn/trunk revision 2974) with the addition of the following variables to the "agc/options.php" file:
+Support for WebSocket applications was added to the agent screen on 2018-04-25(svn/trunk revision 2974) with the addition of the following variables to the "agc/options.php" file on your webserver:
 
 $INSERT_head_script	= '';	# inserted right above the <script language="Javascript"> line after logging in
 $INSERT_head_js		= '';	# inserted after first javascript function
@@ -40,3 +40,10 @@ NOTES:
 
 There are multiple platforms that you can develop a WebSocket-compatible application on, one of them that our clients have used that is open-source based is Qt:
 https://www.qt.io/
+
+
+
+NOTES:
+- If your network uses a proxy to connect to a server using WebSockets(or other SSE), or you are on an older network, you may have issues with WebSockets that are not a problem with old HTTP polling technologies like AJAX(XMLHttpRequest).
+- WebSockets and other SSE technologies don't offer any easy way of monitoring the time it takes to deliver messages, or in some cases even if the message has been delivered.
+- WebSockets and other SSE technologies tie up persisten connections, which may cause load issues on larger implementations.
diff --git a/www/agc/conf_exten_check.php b/www/agc/conf_exten_check.php
index e0a9a96e..449ee900 100644
--- a/www/agc/conf_exten_check.php
+++ b/www/agc/conf_exten_check.php
@@ -86,10 +86,11 @@
 # 200825-2343 - Added option for manual-only sip actions
 # 201111-2140 - Fix for AGENTDIRECT selected in-groups issue #1241
 # 210317-1935 - Added visibility logging
+# 210328-1013 - Fix for emails-in-queue count query, Issue #1170
 #
 
-$version = '2.14-60';
-$build = '210317-1935';
+$version = '2.14-61';
+$build = '210328-1013';
 $php_script = 'conf_exten_check.php';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=51;
@@ -459,7 +460,7 @@ if ($ACTION == 'refresh')
 			else 
 				{
 #				$email_stmt="select count(*) from vicidial_email_list, vicidial_xfer_log where vicidial_email_list.status='QUEUE' and vicidial_email_list.user='$user' and vicidial_xfer_log.xfercallid=vicidial_email_list.xfercallid and direction='INBOUND' and vicidial_xfer_log.campaign_id in ('$AccampSQL') and closer='EMAIL_XFER'";
-				$email_stmt="select count(*) from vicidial_email_list, vicidial_xfer_log where vicidial_email_list.user!='$user' and vicidial_xfer_log.xfercallid=vicidial_email_list.xfercallid and direction='INBOUND' and vicidial_xfer_log.campaign_id in ('$AccampSQL') and closer='EMAIL_XFER'";
+				$email_stmt="select count(*) from vicidial_email_list, vicidial_xfer_log where vicidial_email_list.user!='$user' and NOT ISNULL(vicidial_email_list.xfercallid) and vicidial_xfer_log.xfercallid=vicidial_email_list.xfercallid and direction='INBOUND' and vicidial_xfer_log.campaign_id in ('$AccampSQL') and closer='EMAIL_XFER';";
 				$email_rslt=mysql_to_mysqli($email_stmt, $link);
 		if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$email_stmt,'03042',$user,$server_ip,$session_name,$one_mysql_log);}
 				$email_row=mysqli_fetch_row($email_rslt);