diff --git a/coregrade/src/core/smtp.cc b/coregrade/src/core/smtp.cc
index 92ec481..26a0cea 100644
--- a/coregrade/src/core/smtp.cc
+++ b/coregrade/src/core/smtp.cc
@@ -115,15 +115,15 @@ int SMTP2( const char * _server, const char * _from, char * _to, char * _body, c
 		strcpy(subject,"Wrenchboard Support");
 		logfmt( FLOG_MAX, "Subject is not found - defaulting to: %s", subject );
 	}
-
+/*
 	// Google
 	snprintf( name, BUF_SIZE, EMAIL_PREFIX"/../src/modules/mailsend -smtp %s -f %s -t %s -domain %s -name '%s' +cc +bcc -v -starttls -port 587 -auth-plain -user %s -pass %s -sub '%s' -content-type 'text/html' -mime-type 'text/html' -M '%s'",
 	    _server, _from, _to, _domain, _name, _user, _pass, subject, body != NULL ? body : _body );
-/*
+*/
 	// Virtualmail
 	snprintf( name, BUF_SIZE, EMAIL_PREFIX"/../src/modules/mailsend -smtp %s -f %s -t %s -domain %s -name '%s' +cc +bcc -v -port 25 -auth-plain -user %s -pass %s -sub '%s' -content-type 'text/html' -mime-type 'text/html' -M '%s'",
 	    _server, _from, _to, _domain, _name, _user, _pass, subject, body != NULL ? body : _body );
-*//*
+/*
 	// GoDaddy
 	snprintf( name, BUF_SIZE, EMAIL_PREFIX"/../src/modules/mailsend -smtp %s -f %s -t %s -domain %s -name '%s' +cc +bcc -v -port 80 -auth-plain -user %s -pass %s -sub '%s' -content-type 'text/html' -mime-type 'text/html' -M '%s'",
 	    _server, _from, _to, _domain, _name, _user, _pass, subject, body != NULL ? body : _body );