diff --git a/mod/settings.php b/mod/settings.php
index ea71f7020d..e115556879 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -115,6 +115,8 @@ function settings_post(&$a) {
 
 
 	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+	if(get_config('system','dfrn_only'))
+		$mail_disabled = 1;
 
 	if(! $mail_disabled) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
@@ -355,6 +357,8 @@ function settings_content(&$a) {
 
 
 	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+	if(get_config('system','dfrn_only'))
+		$mail_disabled = 1;
 
 	if(! $mail_disabled) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
diff --git a/view/settings.tpl b/view/settings.tpl
index 50b59cc918..5e8b907695 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -94,10 +94,10 @@ $hide_wall
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-<h3 class="settings-heading">$h_imap</h3>
 {{ if $mail_disabled }}
-	<div class="info-message">$mail_disabled</div>
+
 {{ else }}
+	<h3 class="settings-heading">$h_imap</h3>
 	<p>$imap_desc</p>
 	{{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
 	{{inc field_input.tpl with $field=$mail_server }}{{endinc}}