From df9744084c3fa0a6164bf9440fddad9529dba258 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Fri, 2 May 2014 15:16:11 +0100
Subject: [PATCH] Tweaks to email error rmessages

---
 nodes/core/deprecated/61-imap.js |  2 +-
 nodes/core/social/61-email.js    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nodes/core/deprecated/61-imap.js b/nodes/core/deprecated/61-imap.js
index 560c4a4af..cc636513a 100644
--- a/nodes/core/deprecated/61-imap.js
+++ b/nodes/core/deprecated/61-imap.js
@@ -21,7 +21,7 @@ var util = require('util');
 try {
     var emailkey = RED.settings.email || require(process.env.NODE_RED_HOME+"/../emailkeys.js");
 } catch (err) {
-    util.log("[61-imap.js] Advise : No Email credentials found.");
+    //util.log("[61-imap.js] Info : No Email credentials found.");
 }
 
 if (emailkey) {
diff --git a/nodes/core/social/61-email.js b/nodes/core/social/61-email.js
index 935467016..4f017e18c 100644
--- a/nodes/core/social/61-email.js
+++ b/nodes/core/social/61-email.js
@@ -17,7 +17,12 @@
 var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var util = require('util');
 var nodemailer = require("nodemailer");
-var Imap = require('imap');
+var Imap = null;
+try {
+    Imap = require('imap');
+} catch (e) {
+    util.log("[61-email.js] - imap npm not installed - no inbound email available");
+}
 
 //console.log(nodemailer.Transport.transports.SMTP.wellKnownHosts);
 
@@ -85,7 +90,6 @@ function EmailNode(n) {
 }
 RED.nodes.registerType("e-mail",EmailNode);
 
-
 function EmailInNode(n) {
     RED.nodes.createNode(this,n);
     this.name = n.name;
@@ -202,7 +206,9 @@ function EmailInNode(n) {
 
     node.emit("input",{});
 }
+if (Imap != null) {
 RED.nodes.registerType("e-mail in",EmailInNode);
+}
 
 var querystring = require('querystring');