diff --git a/src/org/sflphone/model/Account.java b/src/org/sflphone/model/Account.java
index a7586c8..36a1d1e 100644
--- a/src/org/sflphone/model/Account.java
+++ b/src/org/sflphone/model/Account.java
@@ -58,6 +58,8 @@
         accountID = bAccountID;
         basicDetails = new AccountDetailBasic(details);
         advancedDetails = new AccountDetailAdvanced(details);
+        
+        Log.e("Account","details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE) "+details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE));
         srtpDetails = new AccountDetailSrtp(details);
         tlsDetails = new AccountDetailTls(details);
         credentialsDetails = new ArrayList<AccountCredentials>();
@@ -113,8 +115,8 @@
         dest.writeString(accountID);
         dest.writeSerializable(basicDetails.getDetailsHashMap());
         dest.writeSerializable(advancedDetails.getDetailsHashMap());
-        dest.writeSerializable(tlsDetails.getDetailsHashMap());
         dest.writeSerializable(srtpDetails.getDetailsHashMap());
+        dest.writeSerializable(tlsDetails.getDetailsHashMap());
         dest.writeInt(credentialsDetails.size());
         for (AccountCredentials cred : credentialsDetails) {
             dest.writeSerializable(cred.getDetailsHashMap());
@@ -236,4 +238,8 @@
         return result;
     }
 
+    public boolean hasSDESEnabled() {
+        return srtpDetails.getDetailString(AccountDetailSrtp.CONFIG_SRTP_KEY_EXCHANGE).contentEquals("sdes");
+    }
+
 }
