diff --git a/include/network.php b/include/network.php
index a663a6d942..4bc50974b0 100644
--- a/include/network.php
+++ b/include/network.php
@@ -826,6 +826,10 @@ function add_fcontact($arr,$update = false) {
 
 function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
 
+	// Suppress "view full size"
+	if (intval(get_config('system','no_view_full_size')))
+		$include_link = false;
+
 	$a = get_app();
 
 	// Picture addresses can contain special characters