diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index f37dafa5..c4d40e61 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -108,8 +108,8 @@ class AccountActivity : AppCompatActivity() {
 
         mediaEnc = acc.mediaEnc
         val mediaEncSpinner = findViewById(R.id.mediaEncSpinner) as Spinner
-        val mediaEncKeys = arrayListOf("zrtp", "dtls_srtpf", "srtp-mand", "srtp", "")
-        val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTPF", "SRTP-MAND", "SRTP", "")
+        val mediaEncKeys = arrayListOf("zrtp", "dtls_srtpf", "srtp-mandf", "srtp-mand", "srtp", "")
+        val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTPF", "SRTP-MANDF", "SRTP-MAND", "SRTP", "None")
         val keyIx = mediaEncKeys.indexOf(acc.mediaEnc)
         val keyVal = mediaEncVals.elementAt(keyIx)
         mediaEncKeys.removeAt(keyIx)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 339801fe..7eb04cfe 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -512,8 +512,13 @@ class MainActivity : AppCompatActivity() {
                             if (acc.mediaEnc == "") {
                                 securityButton.visibility = View.INVISIBLE
                             } else {
-                                securityButton.setImageResource(R.drawable.box_red)
-                                securityButton.tag = "red"
+                                if ((acc.mediaEnc == "srtp-mand") || (acc.mediaEnc == "srtp-mandf")) {
+                                    securityButton.setImageResource(R.drawable.box_yellow)
+                                    securityButton.tag = "yellow"
+                                } else {
+                                    securityButton.setImageResource(R.drawable.box_red)
+                                    securityButton.tag = "red"
+                                }
                                 securityButton.visibility = View.VISIBLE
                             }
                             callButton.visibility = View.INVISIBLE
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b54bde93..54d02d71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,16 +33,16 @@
     </string>
     <string name="auCodecs">List of supported audio codecs in priority order.</string>
     <string name="mediaEnc">Selects media transport encryption protocol.\n
-        ZRTP (recommended) means that ZRTP end-to-end media encryption negotiation is tried after
-        the call has been established.\n
-        DTLS-SRTPF means that UDP/TLS/RTP/SAVPF is offered in outgoing call and that RTP/SAVP,
-        RTP/SAVPF, UDP/TLS/RTP/SAVP, or UDP/TLS/RTP/SAVPF is used if offered in incoming call.\n
-        SRTP-MAND means that RTP/SAVP is offered in outgoing call and that RTP/SAVP or RTP/SAVPF
-        is used if offered in incoming call.\n
-        SRTP means that RTP/AVP is offered in outgoing call and that RTP/SAVP or RTP/SAVPF is used
-        if offered in incoming call.\n
-        EMPTY value means that media encryption is not supported and that media transport protocol
-        thus is RTP/AVP.
+        &#8226; ZRTP (recommended) means that ZRTP end-to-end media encryption negotiation is tried after
+            the call has been established.\n
+        &#8226; DTLS-SRTPF means that UDP/TLS/RTP/SAVPF is offered in outgoing call and that RTP/SAVP,
+            RTP/SAVPF, UDP/TLS/RTP/SAVP, or UDP/TLS/RTP/SAVPF is used if offered in incoming call.\n
+        &#8226; SRTP-MANDF means that RTP/SAVPF is offered in outgoing call and required in incoming call.\n
+        &#8226; SRTP-MAND means that RTP/SAVP is offered in outgoing call and required in incoming call.\n
+        &#8226; SRTP means that RTP/AVP is offered in outgoing call and that RTP/SAVP or RTP/SAVPF is used
+            if offered in incoming call.\n
+        &#8226; None means that media encryption is not supported and that media transport protocol
+            thus is RTP/AVP.
     </string>
     <string name="vmUri">SIP URI for checking of voicemail messages. If left empty, voicemail
         messages (Message Waiting Indications) are not subscribed to.