Index: apps/app_sms.c
===================================================================
--- apps/app_sms.c	(revision 399870)
+++ apps/app_sms.c	(working copy)
@@ -777,7 +777,9 @@
 	if (o >= 0) {
 		char line[1000], mrs[3] = "", *p;
 		char buf[30];
+#ifndef SMS_LOG_NO_CONTENT
 		unsigned char n;
+#endif
 
 		if (h->mr >= 0) {
 			snprintf(mrs, sizeof(mrs), "%02X", h->mr);
@@ -787,6 +789,9 @@
 			status, h->rx ? 'I' : 'O', h->smsc ? 'S' : 'M', mrs, h->queue,
 			S_OR(h->oa, "-"), S_OR(h->da, "-") );
 		p = line + strlen(line);
+#ifdef SMS_LOG_NO_CONTENT
+		p += snprintf(p, sizeof(line) - strlen(line), "udl=%d", h->udl);
+#else
 		for (n = 0; n < h->udl; n++) {
 			if (h->ud[n] == '\\') {
 				*p++ = '\\';
@@ -803,6 +808,7 @@
 				*p++ = h->ud[n];
 			}
 		}
+#endif
 		*p++ = '\n';
 		*p = 0;
 		if (write(o, line, strlen(line)) < 0) {
Index: build_tools/cflags.xml
===================================================================
--- build_tools/cflags.xml	(revision 399870)
+++ build_tools/cflags.xml	(working copy)
@@ -95,4 +95,8 @@
 			<defaultenabled>yes</defaultenabled>
 			<depend>native_arch</depend>
 		</member>
+		<member name="SMS_LOG_NO_CONTENT" displayname="Don't log content of SMS received by app_sms.c for privacy reasons">
+			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
+		</member>
 	</category>
Index: menuselect/test/menuselect-tree
===================================================================
--- menuselect/test/menuselect-tree	(revision 1126)
+++ menuselect/test/menuselect-tree	(working copy)
@@ -582,6 +582,9 @@
 		</member>
 		<member name="INTEGER_CALLERID" displayname="Use the (less accurate) integer-based method for decoding FSK tones (for embedded systems)">
 		</member>
+		<member name="SMS_LOG_NO_CONTENT" displayname="Don't log content of SMS received by app_sms.c for privacy reasons">
+			<depend>app_sms</depend>
+		</member>
 	</category>
 <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_directory.o">
 	<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">