diff --git a/service/src/main/java/lcsb/mapviewer/services/utils/EmailSender.java b/service/src/main/java/lcsb/mapviewer/services/utils/EmailSender.java
index 36475fc1ead5e6d265e4b4bd88fdc9387ad274b3..132f72207c0b9610d3323fe1f85a3ee3002fcc95 100644
--- a/service/src/main/java/lcsb/mapviewer/services/utils/EmailSender.java
+++ b/service/src/main/java/lcsb/mapviewer/services/utils/EmailSender.java
@@ -32,33 +32,33 @@ public class EmailSender {
 	/**
 	 * Default class logger.
 	 */
-	private Logger	logger	= Logger.getLogger(EmailSender.class);
+	private Logger logger	= Logger.getLogger(EmailSender.class);
 
 	/**
 	 * String (usualy email address) that should appear in sender field of the
 	 * email.
 	 */
-	private String	sender;
+	private String sender;
 	/**
 	 * Login used for accessing mail account.
 	 */
-	private String	login;
+	private String login;
 	/**
 	 * Password used for accessing mail account.
 	 */
-	private String	password;
+	private String password;
 	/**
 	 * Server used for smtp.
 	 */
-	private String	smtpHost;
+	private String smtpHost;
 	/**
 	 * Port on the server used by imap.
 	 */
-	private String	imapHost;
+	private String imapHost;
 	/**
 	 * Port on the server used by smtp.
 	 */
-	private String	smtpPort;
+	private String smtpPort;
 
 	/**
 	 * Default constructor that initializes data.
@@ -141,6 +141,10 @@ public class EmailSender {
 	 *           thrown when there is a problem with sending email
 	 */
 	public void sendEmail(List<String> recipients, List<String> ccRecipients, String subject, String message) throws MessagingException {
+		if (smtpHost.equals(ConfigurationElementType.EMAIL_SMTP_SERVER.getDefaultValue())) {
+			logger.warn("Cannot send email. No smpt server defined");
+			return;
+		}
 		// set data of the mail account
 
 		Properties props = System.getProperties();