diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index a3da9add..56d84266 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -91,7 +91,6 @@ class AccountsActivity : AppCompatActivity() {
     }
 
     private fun askPassword(ua: UserAgent) {
-        val builder = AlertDialog.Builder(this)
         val layout = LayoutInflater.from(this)
                 .inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup,
                         false)
@@ -108,7 +107,7 @@ class AccountsActivity : AppCompatActivity() {
             else
                 input.transformationMethod = PasswordTransformationMethod()
         }
-        with (builder) {
+        with (AlertDialog.Builder(this)) {
             setView(layout)
             setPositiveButton(android.R.string.ok) { dialog, _ ->
                 dialog.dismiss()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
index afd0321f..f5164821 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.text.format.DateUtils.isToday
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.widget.AdapterView
 import android.widget.ListView
 import android.widget.TextView
@@ -74,13 +75,14 @@ class CallsActivity : AppCompatActivity() {
             }
             if (SystemClock.elapsedRealtime() - lastClick > 1000) {
                 lastClick = SystemClock.elapsedRealtime()
-                val builder = AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)
-                builder.setMessage(String.format(getString(R.string.calls_call_message_question),
-                        peerName))
-                        .setNeutralButton(getString(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getString(R.string.call), dialogClickListener)
-                        .setPositiveButton(getString(R.string.send_message), dialogClickListener)
-                        .show()
+                with (AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)) {
+                    setMessage(String.format(getString(R.string.calls_call_message_question),
+                            peerName))
+                    setNeutralButton(getString(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getString(R.string.call), dialogClickListener)
+                    setPositiveButton(getString(R.string.send_message), dialogClickListener)
+                    show()
+                }
             }
         }
 
@@ -113,20 +115,22 @@ class CallsActivity : AppCompatActivity() {
                 callText = getString(R.string.calls_call)
             val builder = AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)
             if (peerName.startsWith("sip:"))
-                builder.setMessage(String.format(getString(R.string.calls_add_delete_question),
-                        Utils.friendlyUri(peerName, Utils.aorDomain(aor)), callText))
-                        .setNeutralButton(getString(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getString(R.string.add_contact), dialogClickListener)
-                        .setPositiveButton(String.format(getString(R.string.delete), callText),
-                                dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(String.format(getString(R.string.calls_add_delete_question),
+                            Utils.friendlyUri(peerName, Utils.aorDomain(aor)), callText))
+                    setNeutralButton(getString(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getString(R.string.add_contact), dialogClickListener)
+                    setPositiveButton(String.format(getString(R.string.delete), callText), dialogClickListener)
+                    show()
+                }
             else
-                builder.setMessage(String.format(getString(R.string.calls_delete_question),
-                        Utils.friendlyUri(peerName, Utils.aorDomain(aor)), callText))
-                        .setNeutralButton(getString(R.string.cancel), dialogClickListener)
-                        .setPositiveButton(String.format(getString(R.string.delete), callText),
-                                dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(String.format(getString(R.string.calls_delete_question),
+                            Utils.friendlyUri(peerName, Utils.aorDomain(aor)), callText))
+                    setNeutralButton(getString(R.string.cancel), dialogClickListener)
+                    setPositiveButton(String.format(getString(R.string.delete), callText), dialogClickListener)
+                    show()
+                }
             true
         }
 
@@ -142,20 +146,24 @@ class CallsActivity : AppCompatActivity() {
         when (item.itemId) {
 
             R.id.delete_history -> {
-                val deleteDialog = AlertDialog.Builder(this@CallsActivity)
-                deleteDialog.setMessage(String.format(getString(R.string.delete_history_alert),
-                        aor.substringAfter(":")))
-                deleteDialog.setPositiveButton(getText(R.string.delete)) { dialog, _ ->
-                    CallHistory.clear(aor)
-                    CallHistory.save()
-                    aorGenerateHistory(aor)
-                    clAdapter.notifyDataSetChanged()
-                    dialog.dismiss()
+                val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
+                titleView.text = getString(R.string.confirmation)
+                with (AlertDialog.Builder(this@CallsActivity)) {
+                    setCustomTitle(titleView)
+                    setMessage(String.format(getString(R.string.delete_history_alert),
+                            aor.substringAfter(":")))
+                    setPositiveButton(getText(R.string.delete)) { dialog, _ ->
+                        CallHistory.clear(aor)
+                        CallHistory.save()
+                        aorGenerateHistory(aor)
+                        clAdapter.notifyDataSetChanged()
+                        dialog.dismiss()
+                    }
+                    setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                    show()
                 }
-                deleteDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
-                    dialog.dismiss()
-                }
-                deleteDialog.create().show()
                 return true
             }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
index 5ba1c2e2..2058b46e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
@@ -106,17 +106,21 @@ class ChatActivity : AppCompatActivity() {
             }
             val builder = AlertDialog.Builder(this@ChatActivity, R.style.Theme_AppCompat)
             if (ContactsActivity.contactName(peerUri) == peerUri)
-                builder.setMessage(String.format(getString(R.string.long_message_question),
-                        chatPeer))
-                        .setNeutralButton(getString(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getString(R.string.delete), dialogClickListener)
-                        .setPositiveButton(getString(R.string.add_contact), dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(String.format(getString(R.string.long_message_question),
+                    chatPeer))
+                    setNeutralButton(getString(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getString(R.string.delete), dialogClickListener)
+                    setPositiveButton(getString(R.string.add_contact), dialogClickListener)
+                    show()
+                }
             else
-                builder.setMessage(getText(R.string.short_message_question))
-                        .setNeutralButton(getString(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getString(R.string.delete), dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(getText(R.string.short_message_question))
+                    setNeutralButton(getString(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getString(R.string.delete), dialogClickListener)
+                    show()
+                }
             true
         }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
index d1cdb4f7..f2d33bb0 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
@@ -7,6 +7,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.widget.*
 
 import java.util.*
@@ -81,17 +82,21 @@ class ChatsActivity: AppCompatActivity() {
             val builder = AlertDialog.Builder(this@ChatsActivity, R.style.Theme_AppCompat)
             val peer = ContactsActivity.contactName(uaMessages[pos].peerUri)
             if (peer.startsWith("sip:"))
-                builder.setMessage(String.format(getString(R.string.long_chat_question),
-                        Utils.friendlyUri(peer, Utils.aorDomain(aor))))
-                        .setNeutralButton(getText(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getText(R.string.delete), dialogClickListener)
-                        .setPositiveButton(getText(R.string.add_contact), dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(String.format(getString(R.string.long_chat_question),
+                            Utils.friendlyUri(peer, Utils.aorDomain(aor))))
+                    setNeutralButton(getText(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getText(R.string.delete), dialogClickListener)
+                    setPositiveButton(getText(R.string.add_contact), dialogClickListener)
+                    show()
+                }
             else
-                builder.setMessage(String.format(getString(R.string.short_chat_question), peer))
-                        .setNeutralButton(getText(R.string.cancel), dialogClickListener)
-                        .setNegativeButton(getText(R.string.delete), dialogClickListener)
-                        .show()
+                with (builder) {
+                    setMessage(String.format(getString(R.string.short_chat_question), peer))
+                    setNeutralButton(getText(R.string.cancel), dialogClickListener)
+                    setNegativeButton(getText(R.string.delete), dialogClickListener)
+                    show()
+                }
             true
         }
 
@@ -147,21 +152,25 @@ class ChatsActivity: AppCompatActivity() {
         when (item.itemId) {
 
             R.id.delete_chats -> {
-                val deleteDialog = AlertDialog.Builder(this@ChatsActivity)
-                deleteDialog.setMessage(String.format(getString(R.string.delete_chats_alert),
-                        aor.substringAfter(":")))
-                deleteDialog.setPositiveButton(getText(R.string.delete)) { dialog, _ ->
-                    Message.clear(aor)
-                    Message.save()
-                    uaMessages.clear()
-                    clAdapter.notifyDataSetChanged()
-                    UserAgent.ofAor(aor)!!.account.unreadMessages = false
-                    dialog.dismiss()
+                val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
+                titleView.text = getString(R.string.confirmation)
+                with (AlertDialog.Builder(this@ChatsActivity)) {
+                    setCustomTitle(titleView)
+                    setMessage(String.format(getString(R.string.delete_chats_alert),
+                            aor.substringAfter(":")))
+                    setPositiveButton(getText(R.string.delete)) { dialog, _ ->
+                        Message.clear(aor)
+                        Message.save()
+                        uaMessages.clear()
+                        clAdapter.notifyDataSetChanged()
+                        UserAgent.ofAor(aor)!!.account.unreadMessages = false
+                        dialog.dismiss()
+                    }
+                    setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                    show()
                 }
-                deleteDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
-                    dialog.dismiss()
-                }
-                deleteDialog.create().show()
                 return true
             }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
index eff796ba..0cd7956c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
@@ -21,9 +21,9 @@ import java.io.File
 import java.io.IOException
 import java.util.*
 
-class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<Contact>,
+class ContactListAdapter(private val ctx: Context, private val rows: ArrayList<Contact>,
                          private val aor: String) :
-        ArrayAdapter<Contact>(cxt, R.layout.contact_row, rows) {
+        ArrayAdapter<Contact>(ctx, R.layout.contact_row, rows) {
 
     private var lastClick: Long = 0
 
@@ -59,7 +59,7 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
                 val dialogClickListener = DialogInterface.OnClickListener { _, which ->
                     when (which) {
                         DialogInterface.BUTTON_POSITIVE, DialogInterface.BUTTON_NEGATIVE -> {
-                            val i = Intent(cxt, MainActivity::class.java)
+                            val i = Intent(ctx, MainActivity::class.java)
                             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or
                                     Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                             if (which == DialogInterface.BUTTON_NEGATIVE)
@@ -73,7 +73,7 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
                                 BaresipService.activities.clear()
                                 i.putExtra("uap", ua.uap)
                                 i.putExtra("peer", Contact.contacts()[position].uri)
-                                (cxt as Activity).startActivity(i)
+                                (ctx as Activity).startActivity(i)
                             }
                         }
                         DialogInterface.BUTTON_NEUTRAL -> {
@@ -82,13 +82,14 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
                 }
                 if (SystemClock.elapsedRealtime() - lastClick > 1000) {
                     lastClick = SystemClock.elapsedRealtime()
-                    val builder = AlertDialog.Builder(cxt, R.style.Theme_AppCompat)
-                    builder.setMessage(String.format(cxt.getString(R.string.contact_action_question),
-                            Contact.contacts()[position].name))
-                            .setNeutralButton(cxt.getText(R.string.cancel), dialogClickListener)
-                            .setNegativeButton(cxt.getText(R.string.call), dialogClickListener)
-                            .setPositiveButton(cxt.getText(R.string.send_message), dialogClickListener)
-                            .show()
+                    with (AlertDialog.Builder(ctx, R.style.Theme_AppCompat)) {
+                        setMessage(String.format(ctx.getString(R.string.contact_action_question),
+                                Contact.contacts()[position].name))
+                        setNeutralButton(ctx.getText(R.string.cancel), dialogClickListener)
+                        setNegativeButton(ctx.getText(R.string.call), dialogClickListener)
+                        setPositiveButton(ctx.getText(R.string.send_message), dialogClickListener)
+                        show()
+                    }
                 }
             }
         }
@@ -113,24 +114,28 @@ class ContactListAdapter(private val cxt: Context, private val rows: ArrayList<C
                     }
                 }
             }
-            val builder = AlertDialog.Builder(cxt, R.style.Theme_AppCompat)
-            builder.setMessage(String.format(cxt.getString(R.string.contact_delete_question),
-                    Contact.contacts()[position].name))
-                    .setNegativeButton(cxt.getText(R.string.cancel), dialogClickListener)
-                    .setPositiveButton(cxt.getText(R.string.delete), dialogClickListener)
-                    .show()
+            val titleView = View.inflate(ctx, R.layout.alert_title, null) as TextView
+            titleView.text = ctx.getString(R.string.confirmation)
+            with (AlertDialog.Builder(ctx)) {
+                setCustomTitle(titleView)
+                setMessage(String.format(ctx.getString(R.string.contact_delete_question),
+                        Contact.contacts()[position].name))
+                setNegativeButton(ctx.getText(R.string.cancel), dialogClickListener)
+                setPositiveButton(ctx.getText(R.string.delete), dialogClickListener)
+                show()
+            }
             true
         }
         val actionView = rowView.findViewById(R.id.edit) as ImageButton
         actionView.setOnClickListener { _ ->
             if (SystemClock.elapsedRealtime() - lastClick > 1000) {
                 lastClick = SystemClock.elapsedRealtime()
-                val i = Intent(cxt, ContactActivity::class.java)
+                val i = Intent(ctx, ContactActivity::class.java)
                 val b = Bundle()
                 b.putBoolean("new", false)
                 b.putInt("index", position)
                 i.putExtras(b)
-                (cxt as Activity).startActivityForResult(i, MainActivity.CONTACT_CODE)
+                (ctx as Activity).startActivityForResult(i, MainActivity.CONTACT_CODE)
             }
         }
         return rowView