From 3a2bb130e5beeb9f4eb5e006d4839f2819b43bba Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@ring-packaging.cx>
Date: Fri, 31 May 2019 10:25:35 -0400
Subject: [PATCH] i18n: automatic bump

Change-Id: I8cdff5e766ec3bcb311836730e9a6a21c93dff5f
---
 jami-qt.pro                               |   52 -
 translations/ring_client_windows.ts       | 1482 +++++++------------
 translations/ring_client_windows_ar.ts    | 1534 +++++++------------
 translations/ring_client_windows_bg.ts    | 1532 +++++++------------
 translations/ring_client_windows_ca.ts    | 1518 +++++++------------
 translations/ring_client_windows_cs_CZ.ts | 1556 +++++++-------------
 translations/ring_client_windows_da.ts    | 1534 +++++++------------
 translations/ring_client_windows_da_DK.ts | 1518 +++++++------------
 translations/ring_client_windows_de.ts    | 1576 +++++++-------------
 translations/ring_client_windows_de_DE.ts | 1539 +++++++-------------
 translations/ring_client_windows_el.ts    | 1514 +++++++------------
 translations/ring_client_windows_en_GB.ts | 1482 +++++++------------
 translations/ring_client_windows_eo.ts    | 1534 +++++++------------
 translations/ring_client_windows_es.ts    | 1617 ++++++++-------------
 translations/ring_client_windows_es_AR.ts | 1540 +++++++-------------
 translations/ring_client_windows_et_EE.ts | 1482 +++++++------------
 translations/ring_client_windows_eu.ts    | 1490 +++++++------------
 translations/ring_client_windows_fa_IR.ts | 1542 +++++++-------------
 translations/ring_client_windows_fi.ts    | 1544 +++++++-------------
 translations/ring_client_windows_fr.ts    | 1594 +++++++-------------
 translations/ring_client_windows_fr_BE.ts | 1486 +++++++------------
 translations/ring_client_windows_fr_CA.ts | 1550 +++++++-------------
 translations/ring_client_windows_fr_CH.ts | 1486 +++++++------------
 translations/ring_client_windows_fr_FR.ts | 1494 +++++++------------
 translations/ring_client_windows_he.ts    | 1520 +++++++------------
 translations/ring_client_windows_hi_IN.ts | 1484 +++++++------------
 translations/ring_client_windows_hr.ts    | 1544 +++++++-------------
 translations/ring_client_windows_hu.ts    | 1590 +++++++-------------
 translations/ring_client_windows_id.ts    | 1484 +++++++------------
 translations/ring_client_windows_it.ts    | 1528 +++++++------------
 translations/ring_client_windows_it_IT.ts | 1563 +++++++-------------
 translations/ring_client_windows_ja.ts    | 1534 +++++++------------
 translations/ring_client_windows_ko_KR.ts | 1530 +++++++------------
 translations/ring_client_windows_lt.ts    | 1576 +++++++-------------
 translations/ring_client_windows_ms.ts    | 1506 +++++++------------
 translations/ring_client_windows_nb.ts    | 1570 +++++++-------------
 translations/ring_client_windows_nl.ts    | 1609 +++++++-------------
 translations/ring_client_windows_nl_BE.ts | 1609 +++++++-------------
 translations/ring_client_windows_nl_NL.ts | 1488 +++++++------------
 translations/ring_client_windows_pa.ts    | 1484 +++++++------------
 translations/ring_client_windows_pl.ts    | 1590 +++++++-------------
 translations/ring_client_windows_pl_PL.ts | 1534 +++++++------------
 translations/ring_client_windows_pt.ts    | 1609 +++++++-------------
 translations/ring_client_windows_pt_BR.ts | 1570 +++++++-------------
 translations/ring_client_windows_pt_PT.ts | 1609 +++++++-------------
 translations/ring_client_windows_ro.ts    | 1502 +++++++------------
 translations/ring_client_windows_ru.ts    | 1586 +++++++-------------
 translations/ring_client_windows_ru_RU.ts | 1544 +++++++-------------
 translations/ring_client_windows_sk_SK.ts | 1496 +++++++------------
 translations/ring_client_windows_sl.ts    | 1554 +++++++-------------
 translations/ring_client_windows_sq_AL.ts | 1588 +++++++-------------
 translations/ring_client_windows_sv.ts    | 1558 +++++++-------------
 translations/ring_client_windows_tr.ts    | 1579 +++++++-------------
 translations/ring_client_windows_uk.ts    | 1556 +++++++-------------
 translations/ring_client_windows_zh.ts    | 1516 +++++++------------
 translations/ring_client_windows_zh_CN.ts | 1548 +++++++-------------
 translations/ring_client_windows_zh_TW.ts | 1594 +++++++-------------
 57 files changed, 29592 insertions(+), 56756 deletions(-)

diff --git a/jami-qt.pro b/jami-qt.pro
index c40388e..bc3bd6e 100644
--- a/jami-qt.pro
+++ b/jami-qt.pro
@@ -129,56 +129,4 @@ FORMS += ./aboutdialog.ui \
     ./settingswidget.ui \
     ./videooverlay.ui \
     ./videoview.ui
-TRANSLATIONS += ./translations/ring_client_windows.ts \
-    ./translations/ring_client_windows_ar.ts \
-    ./translations/ring_client_windows_bg.ts \
-    ./translations/ring_client_windows_ca.ts \
-    ./translations/ring_client_windows_cs_CZ.ts \
-    ./translations/ring_client_windows_da_DK.ts \
-    ./translations/ring_client_windows_de.ts \
-    ./translations/ring_client_windows_de_DE.ts \
-    ./translations/ring_client_windows_el.ts \
-    ./translations/ring_client_windows_en_GB.ts \
-    ./translations/ring_client_windows_eo.ts \
-    ./translations/ring_client_windows_es.ts \
-    ./translations/ring_client_windows_es_AR.ts \
-    ./translations/ring_client_windows_et_EE.ts \
-    ./translations/ring_client_windows_eu.ts \
-    ./translations/ring_client_windows_fa_IR.ts \
-    ./translations/ring_client_windows_fi.ts \
-    ./translations/ring_client_windows_fr.ts \
-    ./translations/ring_client_windows_fr_CA.ts \
-    ./translations/ring_client_windows_fr_FR.ts \
-    ./translations/ring_client_windows_he.ts \
-    ./translations/ring_client_windows_hi_IN.ts \
-    ./translations/ring_client_windows_hr.ts \
-    ./translations/ring_client_windows_hu.ts \
-    ./translations/ring_client_windows_id.ts \
-    ./translations/ring_client_windows_it.ts \
-    ./translations/ring_client_windows_it_IT.ts \
-    ./translations/ring_client_windows_ja.ts \
-    ./translations/ring_client_windows_ko_KR.ts \
-    ./translations/ring_client_windows_lt.ts \
-    ./translations/ring_client_windows_ms.ts \
-    ./translations/ring_client_windows_nb.ts \
-    ./translations/ring_client_windows_nl.ts \
-    ./translations/ring_client_windows_nl_BE.ts \
-    ./translations/ring_client_windows_nl_NL.ts \
-    ./translations/ring_client_windows_pa.ts \
-    ./translations/ring_client_windows_pl.ts \
-    ./translations/ring_client_windows_pl_PL.ts \
-    ./translations/ring_client_windows_pt.ts \
-    ./translations/ring_client_windows_pt_BR.ts \
-    ./translations/ring_client_windows_ro.ts \
-    ./translations/ring_client_windows_ru.ts \
-    ./translations/ring_client_windows_ru_RU.ts \
-    ./translations/ring_client_windows_sk_SK.ts \
-    ./translations/ring_client_windows_sl.ts \
-    ./translations/ring_client_windows_sq_AL.ts \
-    ./translations/ring_client_windows_sv.ts \
-    ./translations/ring_client_windows_tr.ts \
-    ./translations/ring_client_windows_uk.ts \
-    ./translations/ring_client_windows_zh.ts \
-    ./translations/ring_client_windows_zh_CN.ts \
-    ./translations/ring_client_windows_zh_TW.ts
 RESOURCES += ressources.qrc
diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index fb1d539..4d36422 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -57,641 +57,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -703,138 +165,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -848,57 +314,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -906,183 +362,160 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1091,46 +524,51 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1153,59 +591,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"></translation>
@@ -1214,17 +662,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1234,6 +682,69 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +763,62 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,49 +832,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1356,138 +884,195 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,37 +1085,32 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,17 +1131,17 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1569,12 +1149,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1582,421 +1162,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 638a8c1..274b8a0 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>إعدادات</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>عام</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>حساب</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>النوع</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>المعلمات</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>اسم المضيف</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>اسم المستخدم</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>كلمة السر</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>الوكيل</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>رقم البريد الصوتي</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>رد ألي على المكالمات</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>تفعيل UPnP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>إسمح لأشخاص  مجهولة بالإتصال</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>إسمح للأشخاص في قائمة الإتصالات المعروفة بالإتصال</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>إسمح  للأشخاص  في تاريخ  المكالمات  بالإتصال</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>موافق</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>تشغيل</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>صوت/فيديو</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>مرمّزات الصوت</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>مرمّزات الفيديو</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>إعدادات متقدمة</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>التسجيل</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>إنقضاء فترة التسجيل (ثواني):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>واجهة الشبكة</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>نقطة عبور ( port ) محلية</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>مثل المعلمات المحلية</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>وضع العنوان و نقطة العبور المنشورة</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>العنوان</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>نقطة عبور ( port )</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>إستعمل STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>عنوان خادم التطبيق</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1716"/>
-        <source>Use TURN</source>
-        <translation>إستعمل TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>حقل ( realm )</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>جلسة تفاوض SDP (حل تعويض ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>هذه الإعدادات مستعملة فقط أثناء جلسات التفاوض SDP في حالة ما ICE ليس مؤيد من طرف خادم التطبيق أو الشخص المكالم.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>نطاق المنفذ RTP الصوتي</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>الحد الأدنى</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>الحد الاقصى</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>نطاق المنفذ RTP فيديو</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>تأمين</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>ألغِ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>موافق</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>العنوان المنشور</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>شهادة CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>شهادة المستخدم</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>المفتاح الخاص</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>كلمة سر المفتاح الخاص</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>إستعمل قائمة الشيفرة المبدئية</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>العنوان</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>تشغيل ذاتي</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>تأمين</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>كلمة سر المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>شهادة المستخدم</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>إستعمل STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>إستعمل TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>إستعمل TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>استمارة</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>محادثات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,180 +360,157 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>أضف إلى الاتصالات المعروفة</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>يريد التحدث إليك!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>أجب</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>نسخ الرقم</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>الحوار</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>إتصال جديد</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>إحذف</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>استمارة</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>استمارة</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>ألغِ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>غادر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>عن RING</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>كلمة السر:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>خذ لمحة</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>اختر اسم مستخدمك</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>التالي</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>فتح ملف</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>ألغِ</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>عام</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>النظام</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
+        <translation>أبقي مصغر عند الغلق</translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>سجل</translation>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>سجل في</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>كاميرا</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>ألغِ</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>استمارة</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>إعدادات</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>حساب</translation>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>عام</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>النظام</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
-        <translation>أبقي مصغر عند الغلق</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>التسجيلات</translation>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>سجل في</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>كلمة السر</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>صوت</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>جهاز الإخراج</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>فيديو</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>جهاز</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>دقة العرض (resolution)</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>المعاينة غير متوفرة أثناء المكالمة</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 291050d..23f0fa7 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Общи</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Акаунт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Вид</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Параметри</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Име на сървъра</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Потребителско име</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Парола</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Прокси</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Номер на гласова поща</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Авт. отговор на обажданията</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP е активиран</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Позволяване на обажданията от непознати</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Позволяване на обажданията от контакти</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Позволяване на обажданията от хора в историята</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Общодостъпно потребителско име</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Нова парола</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Промяна на парола</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Добре</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Избор на тон за звънене</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Пускане</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Звук/видео</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Аудио кодеци</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Видео кодеци</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Разширени</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Регистрация</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Годност на регистрацията (секунди):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Мрежова карта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Местен порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>От</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Използване на местните параметри</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Задаване на публикувания адрес и порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Използване на STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Адрес на сървъра</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Използване на TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Област</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Минимум</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Максимум</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Сигурност</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Устройства</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Добавяне на устройство</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Парола (задължително)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Отказ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Създаденият за Вас Личен Разпознавателен Код</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Звук и видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Активиране на видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>Личен Разпознавателен Код</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Видео кодеци</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Добре</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Блокирани контакти</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Публикуван адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Сертификат от център за сертифициране</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Потребителски сертификат</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Частен ключ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Парола за частен ключ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Използване на шифри по подразбиране</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Начална установка</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Сигурност</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Парола за частен ключ</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Потребителски сертификат</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Използване на STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Използване на TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Използване на TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Звук и видео</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Активиране на видео</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Видео кодеци</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Блокирани IP</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Отблокиране на контакт и добавяне в списъка с контакти</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Разговори</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Грешка при създаването на QR-код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Добавяне към контактите</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Желае да говори с Вас!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Отговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Игнориране</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Блокиране на контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Копиране на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Входящо съобщение от %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Входящо повикване от %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Прозорец</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Нов контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Изтриване</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>това устройство</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>От</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Прозорец</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Добре</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Изнасяне на акаунта</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Създаденият за Вас Личен Разпознавателен Код</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>ПИН</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Затваряне</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Изход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Относно</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Регистриране</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Отказ</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Затваряне</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Мрежова грешка</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Създаване на профил в Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Свързване на това устройство с акаунт</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Свържи това устройство със съществуващ акаунт</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Парола:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Профил</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Акаунт</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Регистриране на публично потребителско име</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Изберете потребителско име</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Потвърдете паролата</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Акаунт за SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Потребителско име</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Предишен</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Напред</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Отваряне на файл</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Грешка при създаването на акаунта</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Всички файлове (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Не е открит клиент за е-поща по подразбиране</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami профил</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Отказ</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Запазване</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Камера</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Отказ</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Акаунт</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Минимизиране при затваряне</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Запазване в</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Парола</translation>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Профил</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Регистрирано име</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Регистриране</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Блокирани контакти</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Акаунт за SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Потребителско име</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Име на сървъра</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Изходящо устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Разделителна способност</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Прегледът не е възможен по време на разговор</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 448791f..cf8cccb 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Opcions</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nom d&apos;amfitrió</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nom d&apos;usuari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Contrasenya</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Intermediari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Nombre de correu de veu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Autorespondre trucades</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP habitlitat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Direcció del servidor de noms</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova contrasenya</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproduir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avançat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Temps d&apos;expiració del registre (segons):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfície de xarxa</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Igual que els paràmetres locals</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Establir port i adreça públics:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adreça</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Utilitza STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Utilitza TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Rang de ports de l&apos;àudio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Mín</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Màx</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Mitjans</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Seguretat</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Habilita el vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositius</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Afegir dispositiu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancel·la</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>D&apos;acord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Adreça publicada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificat CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificat d&apos;usuari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Clau privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Contrasenya de la clau privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Utilitza xifrats per defecte</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adreça</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Seguretat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Contrasenya de la clau privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Utilitza STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Utilitza TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Utilitza TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Mitjans</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Habilita el vídeo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -845,58 +311,48 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>BannedContactsWidget</name>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
+<context>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Converses</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Afegir als contactes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copia el número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Suprimeix</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Quant a</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registra</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Cancel·la</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Error de xarxa</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Enllaça aquest dispositiu a un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Enllaça aquest dispositiu a un compte ja existent</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Entra el pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Intermediari</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nom d&apos;usuari</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Enrere</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Endavant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancel·la</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Desa</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancel·la</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Opcions</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sistema</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identitat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registra</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Contrasenya</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nom d&apos;usuari</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nom d&apos;amfitrió</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Intermediari</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Àudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositiu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 0c8e1ee..21e760f 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -56,641 +56,103 @@ Jami je bezpečný a distribuovaný komunikační program.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Obecné</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Účet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametry</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Název serveru</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Veřejné registrované uživatelské jméno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Uživatelské jméno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Číslo hlasové schránky</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Automaticky přijímat hovory</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP povoleno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Nastavení účtu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Povolit hovory od neznámých</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Povolit hovory od kontaktů</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Povolit hovory z Historie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Obecné nastavení údajů o účtu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Zobrazené jméno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Zadání zobrazené přezdívky</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Adresa názvu serveru pro DHT bootstrap nebo SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Veřejné uživatelské jméno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Zaregistrovat uživatelské jméno na blockchainu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Zaregistrovat uživatelské jméno na blockchainu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Adresa jmenné služby</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Zadání adresy (URL) jmenné služby</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Zadání uživatelského jména pro SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Zadání hesla pro SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Zadání adresy (URL) proxy pro SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Číslo hlasové schránky SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Zaškrtávací okénko pro automatické přijetí volání</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Zaškrtávací okénko pro UPnP povoleno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Řádek pro zadání starého hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Zadat staré heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Staré heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Textové zadání nového hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Zadejte nové heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nové heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Textové zadání potvrzení hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Potvrzení zadání</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Potvrzení nového hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Změnit heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Tlačítko pro zrušení změny hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Mění se heslo…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Zaškrtávací okénko pro povolení hovoru s neznámým uživatelem</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Výběr vyzváněcí melodie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Tlačítko pro přehrání vyzváněcí melodie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Přehrát</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Výběr souboru s vyzváněcí melodií</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Zvuk/Obraz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Nastavení voleb pro kodeky zvuku/obrazu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Zvukové kodeky</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Obrazové kodeky</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Pokročilé</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Pokročilé nastavení účtu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrace</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Vypršení registrace (v sekundách):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Síťové rozhraní</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Místní port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Stejné jako místní parametry</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Zadat veřejnou adresu a port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Připojení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>Použít zaškrtávací okénko STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Použít STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL serveru</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>Použít zaškrtávací okénko TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Použít TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Zadání adresy (URL) serveru TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Zadání uživatelského jména pro server TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Zadání hesla pro server TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Oblast</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Vyjednávání sezení SDP (ICE Fallback)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Tato nastavení jsou použita jen během vyjednávání sezení SDP, v případě že ICE není podporováno serverem nebo peerem.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Rozsah portů pro zvuk RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Rozsah portů pro obraz RTP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Média</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Zabezpečení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Povolit video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Šifrování datového toku (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Zařízení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Přidat tlačítko zařízení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Přidat zařízení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Vyvést na síti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Textové zadání hesla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Heslo (vyžadováno)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Váš vygenerovaný PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Obrazové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Zakázané kontakty</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Zvukové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Zveřejněná adresa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA certifikát</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Uživatelský certifikát</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Soukromý klíč</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Heslo soukromého klíče</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Použít výchozí šifry</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -702,138 +164,142 @@ Jami je bezpečný a distribuovaný komunikační program.</translation>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Název serveru</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Povolit proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Zabezpečení</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Heslo soukromého klíče</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Uživatelský certifikát</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Připojení</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Použít STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Použít TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Použít TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Média</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Povolit video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Zvukové kodeky</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Obrazové kodeky</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -847,57 +313,47 @@ Jami je bezpečný a distribuovaný komunikační program.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Zakázané ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Zrušit zákaz kontaktu, a přidat jej do seznamu spojení</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Konverzace</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,183 +361,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dvakrát klepněte pro kopírování</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Chyba při vytváření QR kódu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Ukázat pozvání</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Chce s vámi hovořit!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Přehlížet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blokovat kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Zkopírovat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Příchozí zpráva od %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Příchozí hovor od %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nový kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1090,48 +523,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>toto zařízení</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulář</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Exportuji účet</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Váš vygenerovaný PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Připojit další zařízení</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Nesprávné heslo</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +661,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Odejít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
@@ -1233,6 +681,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Nastavit registrované jméno</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Zadání textu hesla</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Zadání textu hesla</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Zaregistrovat</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Nesprávné heslo</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Chyba sítě</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +762,62 @@ Please try again later.</source>
         <translation>Vítejte v</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Vytvořit účet Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Připojit toto zařízení k účtu</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Propojit zařízení s již existujícím účtem</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,49 +831,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Vložte svůj pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Nebo zavést soubor:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(žádný)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Název profilu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1355,138 +883,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Zaškrtávací okénko pro veřejné uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Zaškrtnutí okénka, pokud chce uživatel veřejné uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Zaregistrovat veřejné uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Upravení veřejného uživatelského jména</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Zvolte si uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Zadání textu hesla</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Zadání textu hesla</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Textové zadání potvrzení hesla</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Potvrdit heslo</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Účet SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Zadání uživatelského jména pro SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Vytváří se váš účet Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Předchozí strana</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>Tlačítko pro vrácení se v průvodci o stranu zpět</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Zrušit vytváření/propojování účtu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>Tlačítko pro zrušení vytváření nebo propojování účtu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Další strana</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Tlačítko pro přechod na další stranu průvodce</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Další</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Archivní soubory Jami (*.gz); Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Váš účet musí být převeden. Zadejte své heslo.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Převádí se váš účet Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Zavádí se archiv s účtem…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Vytváří se váš účet Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Chyba při vytváření účtu</translation>
     </message>
@@ -1499,37 +1084,32 @@ instead of using your ID.</source>
         <translation>Změnit heslo k účtu</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Zadejte nynější heslo</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Zadejte nové heslo</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Potvrďte nové heslo</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Potvrdit</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Heslo úspěšně změněno</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Nynější heslo je nesprávné</translation>
     </message>
@@ -1550,17 +1130,17 @@ instead of using your ID.</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Vybrat soubor</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Obrázkové soubory (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1568,12 +1148,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Vybrat soubor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Soubory (*)</translation>
     </message>
@@ -1581,83 +1161,30 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Nenalezen žádný výchozí e-mailový klient</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Upravit název zařízení</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Odpojit zařízení od účtu</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Odblokovat kontakt</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Účet Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Nastavit registrované jméno</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Jste si jistý, že chcete zaregistrovat toto jméno?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Jakmile už bude jednou přiřazeno k tomuto účtu, nepůjde změnit.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Vaše nově zaregistrované jméno je:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Potvrdit registraci</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Jméno bylo úspěšně zaregistrováno!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Něco se určitě podělalo.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Zkuste to, prosím, později znovu.</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Váš účet nemá zaregistrované jméno</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1668,49 +1195,6 @@ instead of using your ID.</source>
         <translation>Vybrat složku</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Změnit profilový obrázek</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Uložit</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Udělat obrázek</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Vybrat soubor</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Otevřít obrázek</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Obrázkové soubory (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1719,283 +1203,315 @@ instead of using your ID.</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Zvuk/Obraz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Neukončovat Ring po uzavření okna</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Složka pro stahování</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Nahrávky</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Uložit do</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Vždy nahrávat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Aktualizace</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Zkontrolovat aktualizace nyní</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registrované jméno</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Povolit</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Totožnost</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Registrované jméno</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Zaregistrovat</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Změnit heslo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Vyvést účet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Odstranit účet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Připojená zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Připojit další zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Blokovat kontakty</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Zakázané kontakty</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Pokročilá nastavení účtu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Účet SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Název serveru</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Výběr vstupního zvukového zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Výstupní zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Vybrat název výstupního zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Výběr obrazového zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Rozlišení</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Výběr rozlišení obrazového zařízení</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Náhled během hovoru nedostupný</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Zadejte zobrazené jméno</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Toto uživatelské jméno je již zabráno</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Toto registrované jméno je již zabráno</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Toto jméno je dostupné</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Zaregistrovat toto jméno</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Odstranit zařízení</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Potvrďte, prosím, že chcete odstranit toto zařízení</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Vyvést účet sem</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Vyberte složku pro vaše stahování</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Vyberte složku pro vaše nahrávání</translation>
     </message>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index fdc5f6b..83d3dcb 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Værtsnavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Brugernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Stedfortræder</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Telefonsvarernummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Besvar automatisk opkald</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktiveret</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Tillad opkald fra ukendt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Tillad opkald fra kontakt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Tillad opkald fra historik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Generel kontoinfo-konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Viste navn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Viste aliasinput</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Værtsnavn-URL for DHT-bootstrap eller SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Offentligt brugernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrer på blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Navnetjeneste-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Input af SIP-brugernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Input af SIP-adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Input af URL for SIP-proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linje til input for gammel adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Input gammel adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Gammel adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Tekstinput for ny adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Ny adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Tekstinput for bekræftelse af adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Skift adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Skifter adgangskode ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Valg af ringetone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Afspil ringetone-knap</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Afspil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Lydcodec&apos;er</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video-codec&apos;er</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanceret</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tidsgrænse for registrering (sekunder):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netværksinterface</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokal port:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Samme som lokale parametre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Sæt offentliggjorte adresse og port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>Tekstinput for IP-adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Forbindelse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Brug STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Brug TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP Sessions-forhandling (ICE-tilbagefald)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Disse indstillinger bruges kun under SDP-sessiinsforhandling hvis ICE ikke understøttes af serveren eller modparten.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Område for lyd RTP-port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Område for video RTP-port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sikkerhed</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediestrøm kryptering (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Enheder</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Tilføj enhed-knap</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Medier</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Tilføj enhed</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Aktiver video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Tekstinput for adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Adgangskode (påkrævet)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Annuller kontoeksport for tilknytnings-knap</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuller</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Valider eksport på DHT for enhedstilknytnings-knap</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Din genererede PIN-kode:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Generer PIN for tilknytning</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Denne PIN skal indtastes på den nye enhed inden for 5 minutter. Du kan til enhver tid generere en ny.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Blokerede kontakter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Publiceret Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-certifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Brugercertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privat nøgle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Adgangskode til privat nøgle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Brug standardcifre</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Aktivér proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sikkerhed</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Adgangskode for Privatnøgle</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Brugercertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Forbindelse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Brug STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Brug TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Brug TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Medier</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Aktiver video</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Blokeret ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Ubloker kontakt, og tilføj til kontaktliste</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Tekstinput for søg efter kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Del ring-ID-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklik for at kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR-kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Tilbage til hjemmeside-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Tilføj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer indgående opkald-knap</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Fjern kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloker kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Besked ankommet fra %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>denne enhed</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Din genererede PIN-kode:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Forkert adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Tekstinput for adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Tekstindtastning for adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrér</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Forkert adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Netværksfejl</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Tilknyt enhed-knap</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Tilknyt denne enhed til en konto</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Tilnyt denne enhed til en eksisterende konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Indtast PIN-kode:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Eller importér en fil:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Tilknyt fra eksporteret konto-arkivfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Adgangskode:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrer offentligt brugernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Vælg dit brugernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Tekstinput for adgangskode</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Tekstindtastning for adgangskode</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Adgangskode</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Tekstinput for bekræftelse af adgangskode</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Bekræft adgangskode</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP-konto</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Stedfortræder</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Input af SIP-brugernavn</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Brugernavn</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Forrige side-knap</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Næste side-knap</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Næste</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Åbn fil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Din konto kræver migrering. Indtast din adgangskode.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Ingen standard mail-klient fundet</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuller</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation>Vælg mappe</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Gem</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuller</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Hold minimeret ved lukning</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Optagelser</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Gem i</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Søg efter for opdateringer nu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registreret navn</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Adgangskode</translation>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identitet</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Registreret navn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrér</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Blokerede kontakter</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP-konto</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Brugernavn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Værtsnavn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Stedfortræder</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Outputenhed</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Enhed</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Opløsning</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 840fd3d..9e0a789 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -57,641 +57,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Værtsnavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Brugernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Stedfortræder</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Telefonsvarernummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Svar automatisk opkald</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktiveret</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Tillad opkald fra ukendt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Tillad opkald fra kontakt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Tillad opkald fra historik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Offentligt brugernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrer på blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Navnetjeneste-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Ny adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Skift adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Valg af ringetone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Afspil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audio-codec&apos;er</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video-codec&apos;er</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanceret</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tidsgrænse for registrering (sekunder):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netværksinterface</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokal port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"></translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Samme som lokale parametre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Sæt offentliggjorte adresse og port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Brug STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server-URL</translation>
+        <translation type="unfinished">Brug STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Brug TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP Sessions-forhandling (ICE-tilbagefald)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Disse indstillinger bruges kun under SDP-sessiinsforhandling hvis ICE ikke understøttes af serveren eller modparten.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Område for lyd RTP-port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Område for video RTP-port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sikkerhed</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediestrøm kryptering (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Enheder</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Tilføj enhed</translation>
+        <translation type="unfinished">Brug TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Adgangskode (påkrævet)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuller</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Din genererede PIN-kode:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Denne PIN skal indtastes på den nye enhed inden for 5 minutter. Du kan til enhver tid generere en ny.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Blokerede kontakter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Publiceret Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-certifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Brugercertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privat nøgle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Adgangskode til privat nøgle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Brug standardcifre</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -703,138 +165,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished">Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished">Sikkerhed</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation type="unfinished">Brug STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation type="unfinished">Brug TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation type="unfinished">Brug TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -848,57 +314,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Blokeret ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Ubloker kontakt, og tilføj til kontaktliste</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -906,183 +362,160 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklik for at kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Tilføj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Besked ankommet fra %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1091,46 +524,51 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1153,59 +591,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished">Adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished">Din genererede PIN-kode:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished">PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"></translation>
@@ -1214,17 +662,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -1234,6 +682,69 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished">Adgangskode</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuller</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +763,62 @@ Please try again later.</source>
         <translation type="unfinished">Velkommen til</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished">Tilknyt denne enhed til en konto</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,49 +832,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished">Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1356,138 +884,195 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished">Vælg dit brugernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished">Adgangskode</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished">Bekræft adgangskode</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished">Stedfortræder</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished">Brugernavn</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished">Tilbage</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished">Næste</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished">Åbn fil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished">Din konto kræver migrering. Indtast din adgangskode.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,37 +1085,32 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,17 +1131,17 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1569,12 +1149,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished">Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished">Filer (*)</translation>
     </message>
@@ -1582,421 +1162,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Ingen standard mail-klient fundet</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation type="unfinished">Konto</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Annuller</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation type="unfinished">Generelt</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Annuller</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation type="unfinished">Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation type="unfinished">Konto</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation type="unfinished">Generelt</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation type="unfinished">Adgangskode</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation type="unfinished">Adgangskode</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished">Blokerede kontakter</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished">Brugernavn</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished">Værtsnavn</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"></translation>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished">Stedfortræder</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index c05ee94..0e76021 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -56,643 +56,105 @@ Jami ist eine sichere und verteilte Kommunikationsanwendung.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Rechnername</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Öffentlich registrierter Benutzername</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Benutzername</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Passwort</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Konto hinzufügen</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Nummer für Sprachnachrichten</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Anrufeinstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation>Anrufe automatisch beantworten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktiviert</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Kontoeinstellungen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Anruf von Unbekannt erlauben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Anruf von Kontakt erlauben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Anruf von Verlauf erlauben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Konfiguration der allgemeinen Kontoinformationen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Angezeigter Name</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Öffentlicher Benutzername</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Den Benutzernamen auf der Blockchain registrieren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL des Namensservers</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Altes Passwort</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Neues Passwort eingeben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Neues Passwort</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Neues Passwort bestätigen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Passwort ändern</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Passwort ändern ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Klingelton wählen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Abspielen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audio Codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video Codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Erweitert</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrierung</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Registrierungsverfallzeitüberschreitung (Sekunden):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netzwerkschnittstelle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokaler Port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Identisch zu den lokalen Parametern</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Veröffentlichte Adresse und Port setzen:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>STUN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation> UPnP benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Turn benutzen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Bereich</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP Sitzungsverhandlung (ICE Fallback)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Diese Einstellungen werden nur benutzt für eine SDP-Sitzungsverhandlung im Falle, dass ICE vom Server oder vom Teilnehmer nicht unterstützt wird.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Audio RTP Portbereich</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Video RTP Portbereich</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sicherheit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Konfiguration der Kontosicherheit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Media Stream Encryption (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Geräte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Verwaltung der Kontogeräte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Gerät hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Ins Netzwerk exportieren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Passwort (erforderlich)</translation>
+        <translation>TURN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Ihre generierte PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Video aktivieren</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Bitte gib Deine PIN auf dem neuen Gerät innerhalb von 5 minuten ein. Du kannst jederzeit eine neue PIN generieren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Video Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Audio Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Gesperrte Kontakte</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Audiodateien (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Veröffentlichte Adresse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-Zertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Benutzerzertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privater Schlüssel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Passwort für den privaten Schlüssel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Standardcipher verwenden</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Konto hinzufügen</translation>
-    </message>
 </context>
 <context>
     <name>AdvancedSettingsWidget</name>
@@ -702,138 +164,142 @@ Jami ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Anrufeinstellungen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Anrufe automatisch beantworten</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Proxy aktivieren</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Aktivierung</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Passwort für den privaten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Benutzerzertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>kein Passwort</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA-Zertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Verbindungsmöglichkeiten</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN benutzen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation> UPnP benutzen</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>TURN benutzen</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation> UPnP benutzen</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>TURN benutzen</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Video aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Audio Codecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Video Codecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Audiodateien (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami ist eine sichere und verteilte Kommunikationsanwendung.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Gebannte ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Kontakt entbannen und zur Kontaktliste hinzufügen</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,181 +361,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Doppelklick zum kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fehler bei der Erstellung des QR-Codes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Zu Kontakten hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Möchte mit dir Sprechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Videoanruf starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Audioanruf starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Gesprächsverlauf löschen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Entferne Kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Kontakt blockieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Meine ID ist:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Eingehende Nachricht von %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Eingehender Anruf von %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Neuer Kontakt</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Eingehender Anruf von %1</translation>
     </message>
 </context>
 <context>
@@ -1087,51 +520,56 @@ Copy and share it with your friends!
     <message>
         <location filename="../deleteaccountdialog.ui" line="35"/>
         <source>Account deletion</source>
-        <translation type="unfinished"/>
+        <translation>Kontolöschung</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>dieses Gerät</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Konto wird exportiert</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Ihre generierte PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Falsches Passwort</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +661,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -1233,6 +681,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrieren</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Falsches Passwort</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Netzwerkfehler</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +762,62 @@ Please try again later.</source>
         <translation>Willkommen bei</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Ein Jami-Konto erstellen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Konto verknüpfen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Dieses Gerät mit einem vorhandenen Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,49 +831,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Geben Sie Ihre PIN ein:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Oder eine Datei importieren:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profilname</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1355,138 +883,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Öffentlichen Benutzernamen registrieren</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Nutzername wählen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Passwort bestätigen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP-Konto</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Erzeugen Ihres Jami-Kontos...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ihr Konto muss migriert werden. Bitte geben Sie Ihr Passwort ein.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Fehler beim Erstellen des Kontos</translation>
     </message>
@@ -1499,37 +1084,32 @@ instead of using your ID.</source>
         <translation>Kontopasswort ändern</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Aktuelles Passwort eingeben</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Neues Passwort eingeben</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Neues Passwort bestätigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1550,17 +1130,17 @@ instead of using your ID.</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1568,12 +1148,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
@@ -1581,82 +1161,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Kein Standardprogramm für E‑Mail gefunden</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami-Konto</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Registrierung bestätigen</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1665,50 +1192,7 @@ instead of using your ID.</source>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
         <source>Select folder</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Speichern</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Datei auswählen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Bilddateien  (*.jpg *.jpeg *.png *.bmp)</translation>
+        <translation>Ordner auswählen</translation>
     </message>
 </context>
 <context>
@@ -1719,283 +1203,315 @@ instead of using your ID.</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Beim Schließen minimiert bleiben</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Ordner herunterladen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Aufzeichnungen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Speichern in</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Aktualisierungen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registrierter Name</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Aktivieren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identität</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Registrierter Name</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrieren</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Konten exportieren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Konto löschen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Gesperrte Kontakte</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP-Konto</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Rechnername</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Ausgabegerät</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Auflösung</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Vorschau während Anruf nicht verfügbar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Gerät entfernen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 70fe622..b3f1a0e 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -55,642 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parameter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Benutzername</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>
-    Passwort</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Voicemail-Rufnummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktiviert</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Neues Passwort</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Passwort ändern</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Wiedergeben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audio-Codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video-Codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Erweitert</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netzwerkschnittstelle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>TURN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sicherheit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Geräte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Gerät hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>In das Netzwerk exportieren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Ihre generierte PIN:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Video aktivieren</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Okay</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-Zertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Benutzer-Zertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privater Schlüssel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -702,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Kennwort für privaten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Benutzerzertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>TURN benutzen</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>TURN benutzen</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Video aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -847,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Gespräche</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,180 +360,157 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fehler beim Erzeugen des QR-Codes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Kontakte hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Kontakt blockieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
-        <source>My Id is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
+        <location filename="../callwidget.cpp" line="943"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ContactDialog</name>
     <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Neuer Kontakt</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1090,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>dieses Gerät</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1152,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Kennwort</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Konto wird exportiert</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Ihre generierte PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -1233,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Kennwort</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrieren</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Netzwerkfehler</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Jami-Konto erstellen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem bestehenden Konto verknüpfen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Dieses Gerät mit einem bestehenden Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>PIN eingeben:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Kennwort:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1355,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Kennwort</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Konto bestätigen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Ihr Jami-Konto wird erstellt …</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1499,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1550,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1568,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1581,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami-Konto</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>System</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
+        <translation>Download-Ordner</translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>System</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Kennwort</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
-        <translation>Download-Ordner</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrieren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Kennwort</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index b1384ec..b001263 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Γενικά</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Λογαριασμός</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Τύπος</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Παράμετροι</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Όνομα χρήστη</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Σύνθημα</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Διαμεσολαβητής</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Αριθμός Voicemail</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Αυτόματη απάντηση κλήσεων</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ενεργοποίηση</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL υπηρεσίας ονομάτων</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Νέο συνθηματικό</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Εντάξει</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Αναπαραγωγή</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Ήχος/Βίντεο</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Για προχωρημένους</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Εγγραφή</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Χρονική λήξη καταχώρησης (δευτερόλεπτα):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Διεπαφή δικτύου</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Τα ίδια ως τοπικοί παράμετροι</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Καθορισμός δημοσιευμένης διεύθυνσης και θύρας:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Χρήση STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Χρήση TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Διαπραγμάτευση συνεδρίας SDP (εφεδρικό του ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Αυτές οι ρυθμίσεις χρησιμοποιούνται μόνο κατά την διαπραγμάτευση της συνεδρία SDP, σε περίπτωση που το ICE δεν υποστηρίζεται από τον διακομιστή ή τον κόμβο.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Εύρος θυρών RTP ήχου</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Ελάχιστο</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Μέγιστο</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Εύρος θυρών RTP βίντεο</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Ασφάλεια</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Συσκευές</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Προσθήκη συσκευής</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Ακύρωση</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Το δημιουργημένο σας PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Δημοσιευμένη διεύθυνση</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Πιστοποιητικό CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Πιστοποιητικό χρήστη</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Ιδιωτικό κλειδί</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Συνθηματικό ιδιωτικού κλειδιού</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Χρήση προκαθορισμένων αλγόριθμων κρυπτογράφησης</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Ασφάλεια</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Χρήση STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Χρήση TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Χρήση TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Κωδικοποιητές ήχου</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Κωδικοποιητές βίντεο</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -845,58 +311,48 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>BannedContactsWidget</name>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
+<context>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Συνομιλίες</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Προσθήκη στις επαφές</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Αντιγραφή αριθμού </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Νέα επαφή</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Διαγραφή</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Ακύρωση</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Το δημιουργημένο σας PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Περί</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Σύνδεση αυτής της συσκευής σε έναν λογαριασμό που ήδη υπάρχει</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Εισάγετε το PIN σας:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Συνθηματικό:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Προφίλ</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Συνθηματικό</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Προηγούμενο</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Πίσω</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Επόμενο</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Άνοιγμα αρχείου</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Ακύρωση</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Σύστημα</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Αποθήκευση</translation>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>Αποθήκευση σε</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Κάμερα</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Ακύρωση</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Λογαριασμός</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Σύστημα</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Συνθηματικό</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Εγγραφές</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>Αποθήκευση σε</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Συνθηματικό</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Βίντεο</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Συσκευή</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index b58e048..c0ff6a8 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -57,641 +57,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Play</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -703,138 +165,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -848,57 +314,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -906,183 +362,160 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1091,46 +524,51 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1153,59 +591,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"></translation>
@@ -1214,17 +662,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1234,6 +682,69 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +763,62 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,49 +832,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1356,138 +884,195 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,37 +1085,32 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,17 +1131,17 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1569,12 +1149,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1582,421 +1162,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index e6ba688..5e7c036 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Agordoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Ĝenerala</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametroj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nomo de gastiga komputilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Uzantnomo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Pasvorto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Prokura servilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Parolita mesaĝo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Aŭtomate respondi vokojn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ŝaltita</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Permesi Vokojn de Nekonataj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Permesi Vokojn de Kontaktoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Permesi Vokojn de Historio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL de noma servo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova pasvorto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Okej</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Elekto de vokosono</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Ludi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Aŭdio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Sonkodekoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videokodekoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Speciala</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registriĝo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tempolimo de registriĝo (sekunde):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Reta Interfaco</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Loka Pordo:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Same kiel lokaj parametroj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Agordi publikan adreson kaj pordon:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adreso</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Pordo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Uzi STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL de servilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1716"/>
-        <source>Use TURN</source>
-        <translation>Uzi TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Regno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Intertraktado de SDP seanco (ICE retropaŝo)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Tiuj ĉi agordoj estas uzataj nur dum intertraktado de SDP seanco, se ICE ne estas subtenata de la servilo aŭ samtavolano.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Porda Amplekso de Aŭdia RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Porda Amplekso de Videa RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sekurigo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Aŭdvidflua ĉifrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Aparatoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Aldoni aparaton</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Rezigni</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Via generita PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Okej</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Publikita Adreso</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA atestilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Uzanta atestilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privata ŝlosilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Pasvorto de privata ŝlosilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Uzi defaŭltajn ĉifrojn</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adreso</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Praŝarĝo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sekuro</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Pasvorto de Privata Ŝlosilo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Uzanta Atestilo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Uzi STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Uzi TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Uzi TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Konversacioj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Eraro dum generado de QR Kodo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Aldoni al kontaktoj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Volas paroli kun vi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Respondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Malatenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopii numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Mesaĝo eniranta de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Voko eniranta de %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogo</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nova Kontakto</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Voko eniranta de %1</translation>
     </message>
 </context>
 <context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Forigi</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Rezigni</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Via generita PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Eliri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Pri</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Ligi ĉi tiun aparaton al ekzistanta konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Entajpu vian PIN-on:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Pasvorto:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Elektu vian uzantnomon</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Konfirmu pasvorton</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Antaŭa</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Sekva</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Malfermi Dosieron</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Dosieroj (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Neniu defaŭlta retpoŝta kliento trovita</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Rezigni</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Ĝeneralaj</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sistemo</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
+        <translation>Ne ĉesu pro fermado fenestron</translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Savi</translation>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>Konservi en</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamerao</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Rezigni</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Agordoj</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Konto</translation>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Ĝeneralaj</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sistemo</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
-        <translation>Ne ĉesu pro fermado fenestron</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Registraĵoj</translation>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>Konservi en</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>Identigaĵo</translation>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Pasvorto</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Aŭdio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Eliga aparato</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Aparato</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Distingivo</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Aspekto nehavebla dum voko</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index abd619f..9866c9e 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -56,642 +56,104 @@ Jami es un software de comunicacion seguro y distribuído.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Escribe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parámetros</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nombre del host</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nombre de usuario público registrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nombre de usuario</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numero de Casilla de Mensaje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Respuesta automática de llamadas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP habilitado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Configuración de la cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Permitir llamadas desconocidas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Permitir llamadas de Contactos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Permitir llamada desde el Historial</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuración de información general de la cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nombre mostrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Entrada de alias mostrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Nombre de host URL para DHT bootstrap o SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Usuario público</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Registrar Nombre de usuario en el botón blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrarse en blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL del servicio de nombres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Entrada URL de servicio de nombres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Entrada de nombre de usuario SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Entrada de contraseña SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Entrada de proxy URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Número de mensaje de voz SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Casilla de verificación de llamada de respuesta automática</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Casilla de UPnP habilitado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Antigua línea de entrada de contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Ingresa la contraseña anterior</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Contraseña anterior</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Entrada de texto de nueva contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Ingresa una nueva contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Contraseña nueva</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Confirmación de contraseña de entrada de texto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Confirmación de entrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmación de nueva contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Botón de cancelar cambio de contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Cambiando contraseña ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Recuadro para habilitar llamada de desconocido</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Recuadro para habilitar llamada de historial</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Recuadro para habilitar llamada de contacto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Selección de tono de llamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Botón de reproducir tono de llamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproducir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>selector de archivo para ringtone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuración de preferencias del codec de Audio/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Códecs de audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Códecs de video </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanzado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configuración avanzada de la cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registro</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tiempo de espera de Registración (seg):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation> Casillero selector de registro del tiempo de espera</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfaz de Red</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Puerto Local:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>Casillero selector de puerto local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>igual que el botón de radio local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Igual que los parametros locales</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>Personalizar botón de radio de dirección y puertos.</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Añadir cuenta</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Configurar dirección publicada y puerto:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Dirección</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>entrada de texto de dirección ip</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>casillero selector de puerto</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>usa la casilla STUN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Utilizar STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL del Servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>usar la casilla de verificación TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Utilizar TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Ingresar la URL del servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Ingresar nombre de usuario del servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Ingresar la contraseña del servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Dominio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negociación de sesión SDP (Retorna a ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Estas configuraciones solo se usan durante una negociación de una sesión SDP en caso de que ICE no sea soportado por el servidor o el compañero</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Rango de Puertos RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Mínimo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Límite inferior para el selector de rango de puerto RTP de audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Máximo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Límite superior para el selector de rango de puerto RTP de audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Rango de Puertos RTP de Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Seguridad</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuración de seguridad de la cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Selector de certificados de la autoridad de certificación</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Selector de certificado de usuario</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>introducción de la contraseña de clave privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Selector de clave privada de usuario</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Casilla de verificación del flujo de medios cifrado (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Cifrado del flujo audiovisual (SRPT)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>casilla de verificación cifrado predeterminado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gestión de los dispositivos de la Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Botón de agregar dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Agregar dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exportar a la red</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Entrada de constraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Contraseña (obligatoria)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Cancelar exportación de cuenta por botón de enlace</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Para añadir un nuevo dispositivo a tu cuenta de Jami, exporta tu cuenta a la red. Esto generará un PIN que deberá ser ingresado en tu nuevo dispositivo dentro de los 5 minutos de su generación.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Validar la exportación en DHT para el botón de enlace del dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>PIN generado:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN generado para enlazar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>El pin se debe introducir en su nuevo dispositivo en 5 minutos. Puede generar uno nuevo en cualquier momento.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Aceptar generación de PIN y botón de salir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contactos bloqueados</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Pestaña de gestión de contactos de la cuenta bloqueados</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Dirección IP Publicada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificado CA</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificado de usuario</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Clave privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Contraseña de clave privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Usar cifrados por defecto</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Añadir cuenta</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami es un software de comunicacion seguro y distribuído.</translation>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Configuración de llamada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Permitir llamadas de pares desconocidos</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Auto-responder llamadas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Activar configuración de timbre</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Añadir un timbre a elección</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nombrar Servidor</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configuración de OpenDHT (Tabla de Hash Descentralizada Abierta)</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Habilitar proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Cargador de inicio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Contraseña de clave privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificado del usuario</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>sin contraseña</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Llave Privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Conectividad</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>Dirección TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Utilizar STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Dirección STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>Nombre de usuario TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>Contraseña TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>Usar UPnP (Universal Plug and Play)</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs de audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs de vídeo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Ficheros de audio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami es un software de comunicacion seguro y distribuído.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulario</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lista de contactos bloqueados</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID bloqueado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Botón de desbloqueo de contactos</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Desbloquear contacto, y añadirle a la lista de contactos</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Mostrar conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para buscar contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami es software libre para la comunicación universal que respeta las libertades y la privacidad de sus usuarios.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,181 +363,158 @@ Este es tu ID.
 ¡Cópiala y compártela con tus amigos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar la Ring ID como código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Botón de compartir el ID de Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Doble click para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Hubo un error al generar el código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>mejor nombre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>mejor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Botón para regresar a la página principal</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Añadir a contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Mostrar invitaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Invitaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Encontrar un contacto nuevo o existente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>¡Quiere charlar contigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Botón de respuesta llamada entrante</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorar el botón de llamada entrante</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Contestar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar llamada saliente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Iniciar videollamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Empezar llamada de audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Limpiar conversación</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Eliminar contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copiar Número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Buscar tus invitaciones recibidas</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contacta conmigo en Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Mi Id. es :</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Recibido mensaje de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Llamada entrante de %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Mensaje</translation>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nuevo Contacto</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Introduzca un nombre... </translation>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Llamada entrante de %1</translation>
     </message>
 </context>
 <context>
@@ -1092,46 +525,51 @@ Este es tu ID.
         <translation>Eliminar cuenta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>¿Desea eliminar la siguiente cuenta?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Esta cuenta se perderá definitivamente si no ha sido exportada o añadida a otro dispositivo.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Eliminar cuenta definitivamente</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Cancelar la eliminación de la cuenta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulario</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1154,79 +592,88 @@ Este es tu ID.
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Añadir un nuevo dispositivo</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Para añadir un nuevo dispositivo, ingrese la contraseña de su cuenta:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Ingresar</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Exportando cuenta a la red</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>PIN generado:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Este pin y la contraseña de su cuenta debe ser ingresada en su dispositivo en menos de 5 minutos.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>La contraseña de su cuenta era incorrecta</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Algo falló.
-Por favor inténtelo de nuevo más tarde.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
@@ -1236,6 +683,69 @@ Por favor inténtelo de nuevo más tarde.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +764,62 @@ Por favor inténtelo de nuevo más tarde.</translation>
         <translation>Bienvenido(a) a</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logo de Bienvenida</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Botón para crear cuenta de Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Pulse el boton para activar el inicio de creación de la cuenta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Crear una cuenta en Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Botón de vincular dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Conectar este dispositivo a una cuenta</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Vincular este dispositivo con una cuenta existente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +842,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Recibirás el PIN necesario para completar este formulario. El PIN solo es válido durante &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Escribe tu PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>o importar a un fichero:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Enlace desde archivo de cuenta exportado</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Nada)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nombre de perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1370,138 +897,195 @@ Sus amigos podrán llamarlo por su nombre de usuario
 en lugar de usar su ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Casilla de verificación de nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Marque la casilla de verificación si el usuario desea un nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Editar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Elije un nombre de usuario para ti</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Entrada de constraseña</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Entrada de texto para contraseña</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Confirmación de contraseña de entrada de texto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmar contraseña</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Generando tu cuenta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Botón de página anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>pulse el botón para acceder a la página anterior del asistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Cancelar creación/enlace de cuenta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>presione el botón para cancelar la creación o enlace de cuenta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Volver</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Botón de página siguiente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Pulse el botón para acceder a la siguiente página del asistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Abrir fichero</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Ficheros de archivo de Jami (*.gz); Todos los ficheros (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Debe migrar su cuenta. Introduzca su contraseña.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Migrando su cuenta de Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importando archivo de cuenta...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Generando tu cuenta de Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Error al crear la cuenta</translation>
     </message>
@@ -1514,37 +1098,32 @@ en lugar de usar su ID.</translation>
         <translation>Cambiar contraseña de cuenta</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Ingrese la contraseña actual</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Ingrese la nueva contraseña</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Confirme la nueva contraseña</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Confirmar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>La contraseña ha cambiado correctamente</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Contraseña actual incorrecta</translation>
     </message>
@@ -1565,17 +1144,17 @@ en lugar de usar su ID.</translation>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Pantalla de Photobooth</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Ficheros de imagen (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1583,12 +1162,12 @@ en lugar de usar su ID.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Ficheros (*)</translation>
     </message>
@@ -1596,83 +1175,30 @@ en lugar de usar su ID.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>No se encuentra el cliente de e-mail predeterminado</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Editar nombre del dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Desvincular dispositivo de la cuenta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Desbloquear contacto</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Cuenta de Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Configurar nombre registrado</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>¿Está seguro que desea registrar este nombre?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Una vez asociado con esta cuenta, no puede ser modificado.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Su nuevo nombre registrado es:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Confirmar Registro</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>¡El nombre ha sido registrado exitosamente</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Algo salió mal.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Por favor, inténtelo de nuevo más tarde.</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Su cuenta no tiene un nombre registrado</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1683,49 +1209,6 @@ en lugar de usar su ID.</translation>
         <translation>Seleccionar carpeta</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Cambiar su imagen de avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Tomar fotografía</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Camara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Elija un fichero</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Abrir imagen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Ficheros de imagen (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1734,283 +1217,315 @@ en lugar de usar su ID.</translation>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Casilla para habilitar notificaciones</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Habilitar notificaciones de escritorio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Mantener minimizado al cerrar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Mantener minimizado al cerrar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Descargar carpeta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Grabaciones</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>guardar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Siempre grabando</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Actualizaciones</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Casilla para chequeos automáticos de actualizaciones</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Buscar actualizaciones automáticamente cada</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Selector de intervalo de días entre chequeos de actualizaciones</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>días</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Botón de búsqueda de inmediata actualizaciones</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Buscar actualizaciones ahora</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nombre registrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Activar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Escriba aquí para registrar un nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Cambiar contraseña</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exportar cuenta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Borrar cuenta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Dispositivos conectados</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Conectar otro dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Contactos bloqueados</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Configuraciones de cuenta avanzadas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Micrófono</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Selector de dispositivo de entrada de audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo de salida</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Selecciones el dispositivo de salida</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Selector de dispositivo de video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolución</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Selector de resolución del dispositivo de video</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Vista previa no disponible durante la llamada</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Ingrese el nombre mostrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Un nombre registrado no puede tener espacios y debe tener como mínimo tres letras</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Este nombre ya está tomado</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Este nombre de registro ya está tomado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Este nombre está disponible</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Registrar este nombre</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Quitar dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Ingrese la contraseña de esta cuenta para confirmar la quita de este dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Por favor, confirme que desea remover este dispositivo</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Exportar cuenta aquí</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Elija una carpeta para sus descargas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Elija una carpeta para sus grabaciones</translation>
     </message>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index 76a0560..da6dfd7 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Ajustes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parámetros</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nombre del anfitrión</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nombre de usuario</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP habilitado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Permitir Llamadas de Desconocidos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Permitir Llamadas de Contactos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Permitir Llamadas del Historial</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nombre de usuario público</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Ingresar contraseña anterior</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Contraseña anterior</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Ingresar nueva contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nueva contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Ingresar confirmación</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Cambiar contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Okay</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Cambiando contraseña</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Selección de Ringtone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproducir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Códecs de Audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Códecs de Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanzadas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configuración avanzada de cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registro</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Puerto Local:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Dirección</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL del Servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Seguridad</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuración de seguridad de la Cuenta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Medios</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Añadir dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Permitir video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Tu pin generado:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Clave privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificado de Usuario</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Usar TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Usar TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Medios</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Permitir video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,182 +360,159 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Doble click para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Error al generar el Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Agregar a contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>¡Quiere hablar con vos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Mensaje entrante de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Llamada entrante de %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nuevo Contacto</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Llamada entrante de %1</translation>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Okay</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Tu pin generado:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>Bienvenido a</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Vincular este dispositivo a una cuenta</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Enlazar este dispositivo a una cuenta existente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Ingresá tu pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Editar nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Elegí tu nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmar contraseña</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nombre de usuario</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Abrir Archivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Archivos (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation>Seleccionar carpeta</translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
-        <translation>Seleccionar carpeta</translation>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>Guardar en</translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Cámara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Ajustes</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>General</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sistema</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Grabaciones</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>Guardar en</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Nombre registrado</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nombre Registrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Contraseña</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nombre del anfitrión</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo de Salida</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Selector de dispositivo de video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolución</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index dc72561..5bf960f 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -57,641 +57,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Mängi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -703,138 +165,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -848,57 +314,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -906,183 +362,160 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>vasta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1091,46 +524,51 @@ Copy and share it with your friends!
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1153,59 +591,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"></translation>
@@ -1214,17 +662,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1234,6 +682,69 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +763,62 @@ Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,49 +832,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1356,138 +884,195 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,37 +1085,32 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,17 +1131,17 @@ instead of using your ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1569,12 +1149,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1582,421 +1162,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index 055aa87..12de548 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Orokorra</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Kontua</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Aurreratua</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Ezeztatu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Ezabatu</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Ezeztatu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Itxi</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Honi buruz</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Estekatu gailua kontu batekin</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Kontua</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Ezeztatu</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Kontua</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Orokorra</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Ezeztatu</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Kontua</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Orokorra</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Grabaketak</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Gailua</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index b1ba34e..7b9cfee 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>تنظیمات</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>همگانی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>نوع</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>پارامترها</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>نام میزبان</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>نام کاربری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>گذرواژه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>پراکسی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>شماره پست صوتی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>پاسخگو خودکار تماس‌ها</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP فعال شد</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>اجازه تماس به افراد نانشاخته</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>اجازه به مخاطبان برای تماس</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>نام نمایش داده شده</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>نام کاربری عمومی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>ثبت نام روی بلاکپچین</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>نشانی اینترنتی خدمت نام</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>ورودی نام کاربری SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>ورودی گذرواژه SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>گذرواژه قدیمی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>گذرواژه جدید</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>تایید گذرواژه جدید</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>تغییر رمز عبور</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>خب</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>دکمه لغو تغییر گذرواژه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>در حال تغییر گذرواژه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>انتخاب صدای زنگ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>پخش دکمه صدای زنگ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>پخش</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>انتخاب کننده فایل صدای زنگ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>صدا/تصویر</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>رمزینه های صوتی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>رمزینه های تصویری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>پیشرفته</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>پیکربندی پیشرفته حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>ثبت نام</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>رابط شبکه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>درگاه محلی</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>مشابه دکمه رادیو محلی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>همانند پارامتر‌های محلی</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>نشانی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>درگاه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>اتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>استفاده از STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>آدرس سرور</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>استفاده از TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>دامنهٔ درگاه RTP صدا</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>کمینه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>بیشینه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>دامنه پورت ویدیو RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>امنیت</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>پیکربندی امنیت حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>رسانه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>دستگاه ها</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>فعّال کردن ویدیو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>مدیریت دستگاه های حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>دکمه افزودن دستگاه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>افزودن دستگاه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>ورودی متن گذرواژه</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>گذرواژه (ضروری)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>لغو</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>پین تولید شده شما:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN ایجاد شده برای پیونددهی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>پین</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>خب</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>مخاطبان مسدود شده</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>نشانی منتشر شده</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>گواهی CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>گواهی کاربر</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>کلید خصوصی</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>گذرواژه کلید خصوصی</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>رمزینه‌های صوتی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>نشانی</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>فعال سازی پروکسی</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>خود راه اندازی</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>امنیت</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>گذرواژه  کلید خصوصی</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>گواهی کاربر</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>اتصال</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>استفاده از STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>استفاده از TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>استفاده از TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>رسانه</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>فعّال کردن ویدیو</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>رمزینه‌های صوتی</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -845,58 +311,48 @@ Jami is a secured and distributed communication software.</source>
         <translation>فرم</translation>
     </message>
 </context>
-<context>
-    <name>BannedContactsWidget</name>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>فرم</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>لیست مخاطبان مسدود شده</translation>
-    </message>
+<context>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>آیدی مسدود شده</translation>
+        <location filename="../banneditemwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>نمایش مکالمات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation> گفتگو</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>جمی نرم‌افزار آزاد برای ارتباط جهانی است که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>به اشتراک گذاری دکمه آیدی رینگ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>برای کپی کردن دو بار کلیک کنید</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>خطا در هنگام تولید کد QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>افزودن به مخاطبان</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>نمایش دعوت ها</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>دعوت ها</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>میخواهد با شما حرف بزند!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>دکمه پاسخ به تماس ورودی</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>پاسخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>رد</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>لغو تماس خروجی</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>شروع تماس ویدیویی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>شروع مکالمه صوتی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>پاک کردن مکالمه</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>حذف مخاطب</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>مسدودسازی مخاطب</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>رونوشت از شماره</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>پیام دریافتی از 1%</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>تماس ورودی از %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>مخاطب نو</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>حذف</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>این دستگاه</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>فرم</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>گذرواژه</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>باشه</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>پین تولید شده شما:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>پین</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>بستن</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>گذرواژه ناصحیح</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>خروج</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>درباره</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>ورودی متن گذرواژه</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>گذرواژه</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>ثبت‌نام</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>لغو</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>بستن</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>گذرواژه ناصحیح</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>خطای شبکه</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>خوش آمدید به</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>لوگو خوش آمد</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>ایجاد یک حساب جمی</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>دکمه پیوند دستگاه</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>پیوند این دستگاه به یک حساب</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>پیوند این دستگاه به یک حساب کاربری موجود</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>پین خود را وارد کنید:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>یا درون‌ریزی یک پرونده:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>گذرواژه:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>نمایه</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>حساب کاربری</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>ثبت نام‌کاربری عمومی</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>ویرایش نام کاربری عمومی</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>نام کاربری خود را انتخاب کنید</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>ورودی متن گذرواژه</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>تأیید گذرواژه</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>حساب کاربری سیپ</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>پیشکار یا پروکسی</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>ورودی نام کاربری SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>نام کاربری</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>دکمه صفحه قبلی</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>پیشین</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>بازگشت</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>دکمه صفحه بعد</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>بعدی</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>باز کردن فایل</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>خطای ایجاد حساب</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>انتخاب فایل</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>انتخاب فایل</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>فایل‌ها (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>حساب جمی</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>لغو</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation>انتخاب پوشه</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>ذخیره</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>دوربین</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>لغو</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>فرم</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>حساب کاربری</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>عمومی</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>سامانه</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>شاخهٔ بارگیری</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>ضبط شده‌ها</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>ذخیره کن در</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>دکمه همین الان برروزرسانی ها را چک کن</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>نام ثبت شده</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>شناسه</translation>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>گذرواژه</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>نمایه</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>هویت</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>شناسایی ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>نام ثبت شده</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>ثبت‌نام</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>مخاطبان مسدود شده</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>حساب کاربری سیپ</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>نام کاربری</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>نام میزبان</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>پیشکار یا پروکسی</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>صدا</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>انتخاب کننده دستگاه ورودی صوتی</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>دستگاه خروجی</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>ویدیو</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>دستگاه</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>انتخاب کننده دستگاه ویدیو</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>کیفیت</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>انتخاب کننده کیفیت دستگاه ویدیویی</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 5615f01..c2cff18 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Yleiset</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Tunnus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tyyppi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametrit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Yhteysosoite</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Käyttäjänimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Välityspalvelin</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Vastaajan numero</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Automaattivastaus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP päällä</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Salli puhelut tuntemattomilta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Salli puhelut yhteystiedolta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Salli puhelu historiasta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Julkinen käyttäjänimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Rekisteröi lohkoketjuun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Syötä vanha salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Syötä uusi salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Uusi salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Vaihda salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Vahvista</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Vaihdetaan salasanaa ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Soittoäänen valinta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Toista</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Ääni/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Äänikoodekit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videokoodekit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Edistyneet asetukset</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Rekistöröinti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Rekistöröinnin aikakatkaisu (sekunneissa):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Verkkoliitäntä</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Paikallinen portti:</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Sama kuin paikalliset parametrit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Osoite</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Portti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Yhteydet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Käytä STUNia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Palvelimen osoite</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>RTP porttiväli</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Minimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maksimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Video RTP porttiväli</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Turvallisuus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediavirran salaus (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Laitteet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Lisää laite</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Salasana (vaaditaan)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Peru</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Video päälle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-sertifikaatti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Käyttäjäsertifikaatti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Henkilökohtainen salausavain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Henkilökohtaisen salausavaimen salasana</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Turvallisuus</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Salausavaimen salassana</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Yhteydet</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Käytä STUNia</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Video päälle</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Keskustelu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,182 +360,159 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Virhe generoidessa QR-koodia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Lisää yhteystietoihin</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Haluaa puhua kanssasi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopioi numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Saapuva puhelu %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Uusi yhteystieto</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Saapuva puhelu %1</translation>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Vahvista</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Tunnuksen vienti</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Poistu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Tietoa</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Rekistöröi</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Salasana:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profiili</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Tunnus</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Valitse käyttäjänimesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Varmista salasana</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP tunnus</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Välityspalvelin</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Käyttäjänimi</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Edellinen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Seuraava</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Tiedostot (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Oletussähköpostiohjelmaa ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Muokkaa laitteen nimeä</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Tunnus</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Peruuta</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Yleiset</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
+        <translation>Pidä pinennettynä suljettaessa</translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Tallenna</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Peruuta</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Tunnus</translation>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Yleiset</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Järjestelmä</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
-        <translation>Pidä pinennettynä suljettaessa</translation>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Tallenteet</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profiili</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Rekistöröi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Salasana</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP tunnus</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Käyttäjänimi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Yhteysosoite</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Ääni</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Laite</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Tarkkuus</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 49c1027..6420905 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -56,642 +56,104 @@ Jami est un logiciel libre de communication sécurisé et distribué.</translati
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nom d&apos;hôte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nom d&apos;utilisateur public enregistré</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nom d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Serveur mandataire</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numéro de boîte vocale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Répondre automatiquement</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP activé</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Paramètres Compte Jami</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Autoriser les appels de personnes inconnues</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Autoriser les appels de vos contacts</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Autoriser les appels enregistrés dans l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuration des informations générales du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nom affiché</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Affichage du nom</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Adresse des nœuds d&apos;amorçage ou du serveur SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nom d’utilisateur publique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Enregistrez le nom d&apos;usager sur le blockchain.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Enregistrer sur la blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL du service de noms</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>L&apos;URL du service en entré</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP du nom d&apos;usager en entré</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP du mot de passe en entrée</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Adresse du proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numéro de boite vocale SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Checkbox de réponse d&apos;appel automatique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Checkbox du UPnP activé</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Ligne d&apos;entrée du vieux mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Entrer votre ancien mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Ancien mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Entrée de votre nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Entrer votre nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Texte de confirmation de l&apos;entrée du mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Entrer la confirmation</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmation du nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Changer le mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Bouton d&apos;annulation du changement de mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Modification de mot de passe...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Checkbox permettant l&apos;appel d&apos;un étranger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Checkbox permettant un appel historique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Checkbox permettant un appel des contacts</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Choix de sonneries</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Bouton pour jouer la sonnerie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Lire</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Fichier de sélection de la sonnerie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuration des préférences des codecs audio et vidéo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codecs audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codecs vidéo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Options avancées</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurations avancées du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Enregistrement</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Temps d&apos;expiration de l&apos;enregistrement (en secondes) :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Spinbox sélectionnant le temps limite</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interface réseau</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Port local :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>Spinbox sélectionnant le port local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>Levier de radio local similaire</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Identique aux paramètres locaux</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>Radio button pour personnaliser les addresses et les ports</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Ajouter un compte</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Indiquer l&apos;adresse publiée et le port :</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Paramètres des Appels</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>Champ de saisie d&apos;adresse IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>Répondre automatiquement les appels</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Activer les sonneries personnalisables</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>Spinbox sélectionnant le port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Connectivité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>Case à cocher pour l&apos;utilisation de STUN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>Adresse STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL du serveur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>Case à cocher pour l&apos;utilisation de TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>Utiliser UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Utiliser TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Entrée de l&apos;adresse URL du serveur TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Entrée de l&apos;identifiant du serveur TURN </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Entrée du mot de passe du serveur TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Champ de saisie pour le Realm du serveur TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Domaine</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Négociation de session SDP (bascule sur ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Ces paramètres sont uniquement utilisés durant la négociation de la session SDP au cas où ICE ne serait pas supporté par le serveur ou le correspondant.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Plage des ports RTP audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Minimum</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Sélectionneur de la valeur basse des ports pour l&apos;audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maximum</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Sélectionneur de la valeur haute des ports pour l&apos;audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Plage des ports RTP vidéo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sécurité</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuration de la sécurité du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Sélectionneur du certificat d&apos;autorité</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Sélection de certificat selecteur  </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>Saisie de la clef privée du mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Utiliser la clé privée du sélecteur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Case à cocher pour sélectionner l’encryptions (SRTP) du flux média,</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Chiffrement du flux média (SRTP)</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>Case à cocher pour utiliser les méthodes de chiffrement par défaut</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Appareils</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gestion des appareils de compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Ajouter un bouton d&apos;appareil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Ajouter un nouvel appareil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exporter sur le réseau</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Saisie du mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Mot de passe :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Annuler l&apos;exportation du compte pour le bouton de connexion</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Pour ajouter un nouvel appareil à votre compte Jami, vous devez exporter votre compte sur le Jami. Cela générera un code PIN qui devra être saisi sur le nouvel appareil dans les 10 minutes suivant sa génération.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Valider l&apos;exportation sur DHT pour le boutton de l&apos;appareil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Votre NIP généré :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>NIP généré pour la liaison</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>NIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Ce NIP doit être saisi dans votre nouvel appareil dans les 5 prochaines minutes. Vous pouvez en générer un nouveau en tout temps.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Bouton pour accepter la génération du NIP et quitter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contacts bannis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Onglet Gestion des contacts interdits du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Adresse publiée</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificat CA</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Médias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificat utilisateur</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Activer la vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Clé privée</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Codecs vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Mot de passe clé privée</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Codecs audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Utiliser les modes de chiffrements par défaut</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Fichiers audio ( wav, ogg, opus, mp3, aiff, wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Ajouter un compte</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Ajouter une sonnerie externe</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami est un logiciel libre de communication sécurisé et distribué.</translati
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Paramètres des Appels</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Accepter les appels provenant de peers non fiables</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Répondre automatiquement les appels</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Activer les sonneries personnalisables</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Ajouter une sonnerie externe</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nom du Serveur</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configuration OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Utiliser un nœud délégataire </translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Adresse du nœud d&apos;amorçage</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Mot de passe de la clé</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificat de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>pas de mot-de-passe</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Clé privée</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connectivité</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>Adresse TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Adresse STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>Nom d&apos;utilisateur TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>Mot de passe TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>Utiliser UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>Utiliser TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Médias</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Activer la vidéo</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs vidéo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Fichiers audio ( wav, ogg, opus, mp3, aiff, wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami est un logiciel libre de communication sécurisé et distribué.</translati
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Liste de contacts bannis</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Exclu</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Débloquer le contact </translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Débloquer un contact et l&apos;ajouter à la liste des contacts</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Montrer les conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Rechercher le texte du contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,183 +361,160 @@ Copy and share it with your friends!
         <translation>Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Montrer le code QR d&apos;identification ring </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Partager le bouton d&apos;identification ring </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Double-cliquez pour copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Erreur pendant la génération du QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>meilleur nom</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>Meilleur ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Bouton de retour a la page d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Montrer les invitations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Invitations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Recherche de contacts nouveaux ou existants</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>souhaite entrer en communication !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Bouton de réponse d&apos;appel </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Bouton de refus d&apos;appel </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Annuler l&apos;appel sortant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Démarrer un appel vidéo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Démarrer un appel audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Effacer la conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Retirer le contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloquer le contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copier le numéro ou identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Rechercher dans les invitations reçues</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contactez moi sur Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Mon ID est :</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Message en provenance de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Entrer un nom...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1090,47 +523,52 @@ Copy and share it with your friends!
         <translation>Suppression de compte</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Souhaitez-vous vraiment supprimer ce compte ?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Si ce compte n&apos;a pas été exporté, ou ajouté vers un autre appareil, il sera perdu irrémédiablement.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Supprimer de manière définitive le compte</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Annuler la suppression du compte</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>PushButton</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>cet appareil</translation>
     </message>
 </context>
 <context>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulaire</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialogue</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Ajouter un nouvel appareil</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Pour ajouter un nouvel appareil, entrer le mot de passe de votre compte:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Entrer</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Compte exporté</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Exporter le compte sur le réseau</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Votre NIP généré :</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>NIP</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Ce NIP ainsi que le mot de passe du compte doivent être saisis dans votre nouvel appareil dans les 10 prochaines minutes. </translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Le mot de passe du compte est incorrect</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Associer un autre appareil</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Mot de passe incorrecte</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>Quelque chose s&apos;est mal passée. 
@@ -1214,17 +662,17 @@ Veuillez réessayer plus tard.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Sortir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
@@ -1234,6 +682,69 @@ Veuillez réessayer plus tard.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Enregistrer un nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Saisie du mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Saisie de mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Enregistrer</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Mot de passe incorrecte</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Erreur de réseau</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +763,62 @@ Veuillez réessayer plus tard.</translation>
         <translation>Bienvenue sur</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logo d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Bouton de création de compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Bouton pour déclencher la création d&apos;un compte Ring</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Créer un compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Bouton pour lier le compte de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Appuyez sur le bouton pour déclencher la liaison de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Lier cet appareil à un compte existant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1313,49 +839,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Vous obtiendrez alors un NIP qui vous permettra  de terminer l&apos;opération. Ce NIP est seulement valide pour une durée de &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Entrez votre NIP :</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ou importer une archive : </translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Lier depuis une archive du compte exportée</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(None)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nom du profile</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1365,138 +893,195 @@ Ceci réserve ce nom de façon définitive et uniquement pour votre usage.
 Vos amis pourront vous appeler avec ce nom.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>case à cocher nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Case à cocher si l&apos;utilisateur veut un identifiant public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Modification de l&apos;identifiant public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Choisissez un nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Saisie du mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Saisie de mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Texte de confirmation de l&apos;entrée du mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Compte SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Serveur mandataire</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>SIP du nom d&apos;usager en entré</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Génération de votre compte Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Bouton de la page précédente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>Appuyez sur le bouton pour accéder à la page précédente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Annuler la création/lien de compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>Bouton pour déclencher la création d&apos;un compte Jami ou association</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>bouton prochaine page</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Appuyez sur le bouton pour accéder à la page suivante de l&apos;assistant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Fichier d&apos;archive de compte Jami (*.gz); Tout fichier (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Votre compte doit être migré. Entrez votre mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Migration de votre compte Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importation de l&apos;archive du compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Génération de votre compte Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Erreur pendant la création du compte</translation>
     </message>
@@ -1509,37 +1094,32 @@ Vos amis pourront vous appeler avec ce nom.</translation>
         <translation>Changer le mot de passe du compte</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Entrez le mot de passe actuel</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Entrez le nouveau mot de passe</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Confirmer le nouveau mot de passe</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Confirmer</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Le mot de passe a été modifié</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Mot de passe actuel incorrect </translation>
     </message>
@@ -1560,17 +1140,17 @@ Vos amis pourront vous appeler avec ce nom.</translation>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Affichage du photomaton</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Fichiers images (JPG, JPEG, PNG)</translation>
     </message>
@@ -1578,12 +1158,12 @@ Vos amis pourront vous appeler avec ce nom.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1591,83 +1171,30 @@ Vos amis pourront vous appeler avec ce nom.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Aucun client email trouvé</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Modifier le nom de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Dissocier cet appareil d&apos;un compte</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Débloquer un contact</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Compte Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Enregistrer un nom d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Êtes-vous certain de vouloir enregistrer ce nom ? </translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Une fois associé à ce compte, cela ne peut être modifié.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Votre nouveau nom enregistré est:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Confirmer l&apos;enregistrement</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Le nom d&apos;utilisateur a été enregistré avec succès!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Quelque chose s&apos;est mal passée.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Veuillez réessayer plus tard</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Votre compte ne possède pas de nom enregistré d&apos;utilisateur </translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1678,49 +1205,6 @@ Vos amis pourront vous appeler avec ce nom.</translation>
         <translation>Selectionner  le fichier</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Changer l&apos;image de l&apos;avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Sauvegarder</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Prendre une photo</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Caméra</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Choisir un fichier</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Ouvrir une image</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Fichiers images (JPG, JPEG, PNG, BMP)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1729,283 +1213,315 @@ Vos amis pourront vous appeler avec ce nom.</translation>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Activer les notifications</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Activer les notifications du bureau</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Laisser minimisé à la fermeture checkbox</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Laisser minimisé en fermant</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Répertoire de téléchargement</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Enregistrements</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Enregistrer dans</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Enregistrer tout le temps</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Mises à jour</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Case à cocher pour les mises à jour automatiques</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Vérifiez automatiquement les mises à jours tous les </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Sélectionneur d&apos;intervalle de jour pour la vérification des mises à jour</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>jours</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Bouton vérifier les mises à jour actuelles</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Vérifier les mises-à-jour</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nom enregistré</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identité</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Identifiant</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Nom enregistré</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Saisissez ici le nom d&apos;enregistrement</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Enregistrer</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exporter le compte</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Supprimer le compte</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Appareils associés</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Associer un autre appareil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Contacts bloqués</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Contacts bannis</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Paramètres avancés du compte</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Compte SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nom d&apos;hôte</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Serveur mandataire</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microphone</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Sélecteur d&apos;entrée audio </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Choisissez le périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Appareil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Sélecteur de périphérique vidéeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Résolution</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Sélectionneur de la résolution vidéo.</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Prévisualisation indisponible durant l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Entrer le nom d&apos;affichage</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Un nom d’enregistrement est composé d&apos;un minimum de 3 caractères et ne doit contenir aucun espace</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Ce nom a déjà été pris</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Ce nom d&apos;enregistrement est déjà pris</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Ce nom est disponible</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Enregistrer ce nom</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Supprimer cet appareil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Entrer le mot de passe du compte pour confirmer la suppression de cet appareil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Veuillez confirmer que vous souhaitez supprimer cet appareil</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Exporter le compte ici</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Choisissez un répertoire pour vos téléchargements</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Choisissez un répertoire pour vos enregistrements</translation>
     </message>
diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts
index 901aabc..230d6f7 100644
--- a/translations/ring_client_windows_fr_BE.ts
+++ b/translations/ring_client_windows_fr_BE.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Options avancées</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Créer un compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Général</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Caméra</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 87cdd09..f06922f 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -56,642 +56,104 @@ Jami est un logiciel de communication sécurisé et distribué.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Réglages</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nom d&apos;hôte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nom d&apos;utilisateur public </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nom d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numéro de boîte vocale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Réponse-automatique aux appels</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP activé</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Paramètres du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Autoriser les appels d&apos;une source inconnue</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Autoriser les appels de vos contacts</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Autoriser l&apos;appel de l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuration des informations générales du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nom affiché</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Entrée d&apos;alias affichée</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nom d&apos;utilisateur public</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL de l&apos;annuaire de nom</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Entrée de l&apos;URL du service de noms</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Entrée du username SIP </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Entrée du mot de passe SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Entrée du proxy du URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numéro de la boîte vocale SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Case à cocher de réponse d&apos;appel automatique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Ancienne ligne de saisie de mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Rentrer ancien mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Ancient mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Nouvelle entrée de texte de mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Entrer nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Mot de confirmation de saisie de texte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Entrer confirmation</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmation du nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Changer mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Le bouton annuler le changement de mot de passe </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Changement de mot de passe ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Autoriser l&apos;appel d&apos;une case inconnue </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Autoriser l&apos;appel à partir de l&apos;historique </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Autoriser l&apos;appel à partir des contacts </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Sélection de sonneries</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Jouer sonnerie téléphonique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Jouer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>sélecter un fichier de sonnerie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuration des préférences de codecs audio/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audio codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Vidéo codecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avancé</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurations avancées de compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Enregistrement</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>L&apos;expiration de l&apos;enregistrement expire (secondes):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interface réseau</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Port local :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>même que le bouton radio local </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Même que les paramètres locaux </translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>Bouton de personnalisation d&apos;adresse et de ports radios </translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Ajouter un compte</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Établir une adresse publiée et  un port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Paramètres d&apos;appel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>Entrée texte de l&apos;adresse IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>Réponse automatique aux appels</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Activer une sonnerie personnalisée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Connectivité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Utiliser le TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>entrée URL du serveur TURN </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Entrée du nom d&apos;utilisateur du serveur TURN </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Entrée du mot de passe du serveur TURN </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Entrée Realm du serveur TURN </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Plage de ports d&apos;audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sécurité</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Confirmation de la sécurité du compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Sélecter un certificat d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Appareils</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Bouton d&apos;ajout d&apos;appareil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Ajouter un appareil</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Média</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Activer la vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Entrée du mot de passe </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Mot de passe </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation> Pour associer un nouvel appareil à un compte Jami, vous exportez votre compte sur le réseau Jami. Cela générera un numéro NIP que vous devrez saisir dans votre nouvel appareil dans les 5 minutes. </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Votre NIP généré :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>NIP généré pour le pairage</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>NIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Le NIP devrait être saisi dans votre nouvel appareil dans les 5 minutes suivant sa création. Vous pouvez générer un nouveau NIP à tout moment. </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Acceptez la gérération du NIP et bouton quitter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contacts bloqués</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Adresse publiée</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificat d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>clé privée</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Codecs Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Mot de passe de la clé privée </translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Codecs Audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Ajouter un compte</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Ajouter une sonnerie personnalisée</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Paramètres d&apos;appel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation> Autoriser les appels d&apos;une source inconnue </translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Réponse automatique aux appels</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Activer une sonnerie personnalisée</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Ajouter une sonnerie personnalisée</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nom du serveur</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configuration de l&apos;OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Activer le Proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Amorcer</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Mot de passe de la clé privée</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>certificat d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>Aucun mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Clé privée</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connectivité</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Utiliser le TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Utiliser le TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Média</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Activer la vidéo</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs Audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs Vidéo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -847,57 +313,47 @@ Jami est un logiciel de communication sécurisé et distribué.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulaire </translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Liste de contacts bannis</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Identifiant banni</translation>
+        <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Bouton débannir un contact</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,183 +361,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Bouton partager l&apos;identificateur Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Une erreur s&apos;est produite lors de la génération du code QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>veut vous parler!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Répondre à l&apos;appel entrant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer l&apos;appel entrant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Réponse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Message entrant de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1090,48 +523,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>cet appareil</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulaire </translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialogue</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Votre NIP généré :</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>NIP</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Mot de passe incorrect</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +661,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
@@ -1233,6 +681,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Entrée du mot de passe </translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Inscription</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Mot de passe incorrect</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Erreur de réseau</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +762,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Créer un compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Associer cet appareil à un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Associer cet appareil avec un compte existant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,49 +831,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Entrer votre NIP :</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ou importer une archive de compte Ring :</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1355,138 +883,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Modification du nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Choisissez votre nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Entrée du mot de passe </translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Mot de confirmation de saisie de texte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Compte SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Entrée du username SIP </translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Bouton page précédente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Bouton page suivante</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Appuyer sur le bouton pour accéder à la prochaine page de l&apos;assistant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1499,37 +1084,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1550,17 +1130,17 @@ instead of using your ID.</source>
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Choisir le fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1568,12 +1148,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Choisir le fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1581,82 +1161,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Aucun client de courriel par défaut n&apos;a été trouvé</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1668,49 +1195,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Sauvegarder</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Caméra</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1719,283 +1203,315 @@ instead of using your ID.</source>
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Enregistrements</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Vérifier les mises à nouveaux maintenant </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>Identifiant</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identité</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Nom enregistré</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Inscription</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Contacts bloqués</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Compte SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nom de domaine</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Appareil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Résolution</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>L&apos;aperçu n&apos;est pas disponible pendant un appel</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts
index 2211ba6..ee7ff04 100644
--- a/translations/ring_client_windows_fr_CH.ts
+++ b/translations/ring_client_windows_fr_CH.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Options avancées</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Enregistrer</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Créer un compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Général</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Caméra</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index 461d645..bfe1fab 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Réglages</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>parametres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>nom d&apos;hôte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>nom d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>boite vocale </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Réponse automatique de l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>autoriser les appels connu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Autoriser l&apos;appel du contact</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Autoriser l&apos;appel depuis l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Affichage du nom</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>nom public</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>entrée ancien mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>ancien mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>entrée  le nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nouveau mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>confirmation d&apos;entrée</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Nouvelle confirmation de passage</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>changer le mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>d&apos;accord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>jouer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Options avancées</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL du serveur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>securité</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>securité</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami est un logiciel libre de communication universel qui respecte la vie privée et l&apos;intimité de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Ajouter dans les contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copier le numéro de téléphone</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>A propos </translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Créer un compte Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>compte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Enregistrer un nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Retour</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>compte</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Général</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Système</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Réglages</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>compte</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Système</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 05682c7..f61c7f1 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>הגדרות</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>כלליות</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>חשבון</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>טיפוס</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>פרמטרים</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>שם מארח</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>שם משתמש</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>סיסמה</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>פרוקסי</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>מספר תא קולי</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP מאופשר</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>אודיו/וידאו</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>מתקדם</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>רישום</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>ממשק רשת</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>פורט מקומי:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>זהה לפרמטרים מקומיים</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>קבע כתובת ופורט מפורסמים:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>כתובת</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>פורט</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL שרת</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>תחום</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>מינימום</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>מדיה</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>מקסימום</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>אבטחה</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>התקנים</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>אפשר וידאו</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>ביטול</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>תעודת CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>תעודת משתמש</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>מפתח פרטי</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>כתובת</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>אבטחה</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>סיסמת מפתח פרטי</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>מדיה</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>אפשר וידאו</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -840,63 +306,53 @@ Jami is a secured and distributed communication software.</source>
 <context>
     <name>AnimatedOverlay</name>
     <message>
-        <location filename="../animatedoverlay.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BannedContactsWidget</name>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../animatedoverlay.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>דיונים</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>העתק מספר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>דו שיח</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>איש קשר חדש</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>מחק</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>דו שיח</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>סיסמה</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>אודות</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>סיסמה</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>הירשם</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>פרופיל</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>חשבון</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>חשבון SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>פרוקסי</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>שם משתמש</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>קדימה</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>קבצים (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>חשבון</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>ביטול</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>כלליות</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>שמור</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>ביטול</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>הגדרות</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>חשבון</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>כלליות</translation>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>הקלטות</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>פרופיל</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>הירשם</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>מזהה</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>סיסמה</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>חשבון SIP</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>שם משתמש</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>שם מארח</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>פרוקסי</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>אודיו</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>וידאו</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>מכשיר</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>רזולוציה</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index 60358a0..29943f6 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>खाता</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>शुरू करें</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>खाता</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>खाता</translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>खाता</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>आॅडियो</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>वीडियो</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index dfb5319..c1f00dc 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Postavke</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Opće</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Vrsta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Ime poslužitelja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Korisničko ime</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Lozinka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Broj govorne pošte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Automatski primi pozive</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP omogućen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova lozinka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>U redu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Odabir melodije zvona</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>izvodi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audio kodeci</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video kodeci</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Mrežno sučelje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokalni port:</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Isto kao i lokalni parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Spojivost</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Koristi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL poslužitelja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Koristi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Minimalno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maksimalno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sigurnost</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Uređaji</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Medij</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Poništi</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Omogući video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>U redu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Korisnički certifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privatni ključ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Lozinka privatnog ključa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sigurnost</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Lozinka privatnog ključa</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Korisnički certifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Spojivost</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Koristi STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Koristi TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Koristi TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Medij</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Omogući video</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Razgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Greška prilikom generiranja QR koda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Dodaj u kontakte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti sa vama!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Javi se</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blokiraj kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopiraj broj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Dolazni poziv od %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dijalog</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Novi kontakt</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Dolazni poziv od %1</translation>
     </message>
 </context>
 <context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dijalog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>U redu</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>izvozim račun</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Izađi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registriraj</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Poništi</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Greška mreže</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Napravite Jami račun</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Povežite ovaj uređaj s računom</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Izaberite vaše korisničko ime</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Potvrdi lozinku</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP račun</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Korisničko ime</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Natrag</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Slijedeće</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Otvori datoteku</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Poništi</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Opće</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sustav</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Spremi</translation>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>Spremi u</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Poništi</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Postavke</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Opće</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sustav</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Snimke</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>Spremi u</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registriraj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Lozinka</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP račun</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Korisničko ime</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Ime poslužitelja</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Izlazni uređaj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Uređaj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Razlučivost</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 2724920..6b3ad36 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -56,642 +56,104 @@ A Jami egy biztonságos és osztott csevegőprogram.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Általános</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Fiók</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Típus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Paraméterek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Kiszolgálónév</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nyilvános bejegyzett felhasználónév</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Felhasználónév</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Jelszó</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Fiók hozzáadása</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Meghatalmazott</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Hangpostaszám</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Hívás beállítások</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation>Hívások önműködő fogadása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP engedélyezve</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Fiók beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Hívások engedélyezése ismeretlenektől</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Hívások engedélyezése a kapcsolatlista tagjaitól</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Hívások engedélyezése az előzményekben szereplőktől</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Általános fiókinformáció beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Megjelenített név</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Megjelenített álnév bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Gépnév URL rendszerbetöltő DHT-nek vagy SIP-nek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nyilvános felhasználónév</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Felhasználónév bejegyeztetése az elosztott adatbázison gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Elosztott adatbázis bejegyeztetése</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Webcím névszolgáltatás</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Névszolgáltató URL-bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP felhasználónév bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP jelszó bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP-meghatalmazott URL-bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP hangpostaszám</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Önműködő válasz hívás jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>UPnP engedélyezett jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Régi jelszó beviteli sor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Adja meg a régi jelszót</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Régi jelszó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Új jelszó beviteli szöveg</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Adja meg az új jelszót</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Új jelszó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Jelszó megerősítési szövegbevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Beviteli megerősítés</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Új átmenet megerősítése </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Jelszó megváltoztatása</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Mégsem jelszó módosítás gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Fiók jelszó megváltoztatása, kis türelmet…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Hívás engedélyezése az ismeretlen jelölőnégyzetből</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Hívások engedélyezése az előzményekben szereplők jelölőnégyzetéből</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Hívások engedélyezése a kapcsolatlista tagjainak jelölőnégyzetéből</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Csengőhang kiválasztása</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Csengőhang lejátszása gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Lejátszás</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>csengőhang fájl választó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Hang/videó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Audió- és videó-kodek beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Hangcodekek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videócodekek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Haladó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Fiók haladó beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Bejegyeztetés</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Bejegyeztetés érvényességének lejárta (másodperc):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Bejegyeztetés időtúllépés választó pörgésdobozt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Hálózati interfész</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Helyi kikötő:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>helyi kikötő választó pörgésdobozt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>ugyanaz, mint a helyi rádió gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Ugyanaz, mint a helyi paraméterek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>személyre szabott cím és kikötők rádió gombja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Nyilvános cím és kikötő megadása:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Cím</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>IP címes szövegbevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Kikötő</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Egyéni csengőhang engedélyezése</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>kikötő választó pörgésdobozt</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Kapcsolódás</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>használja a STUN jelölőnégyzetet</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>STUN cím</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>STUN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Kiszolgáló-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>használja a TURN jelölőnégyzetet</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>UPnP használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>TURN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>TURN kiszolgáló-URL bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>TURN kiszolgáló felhasználónév bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>TURN kiszolgáló jelszó bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>TURN kiszolgáló tartomány bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Tartomány</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP munkamenet targyalás (az ICE tartaléka)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Ezek a beállítások csak az SDP munkamenet tárgyalásánál kerülnek használatra, ha a kiszolgáló vagy a kapcsolat nem támogatja az ICE-t.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Hang RTP-kikötő tartomány</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Minimum</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Alsó határok az audió RTP-kikötő tartomány választóhoz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maximum</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Felső határok az audió RTP-kikötő tartomány választóhoz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Videó RTP-kikötő tartomány</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Biztonság</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Fiók biztonsági beállítások</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Tanúsítvány kibocsátó tanúsítvány választó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Felhasználói tanúsítvány választó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>Személyes kulcs jelszava bevitel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Felhasználói személyes kulcs választó</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Média-adatfolyam titkosítása (SRTP) jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Média-adatfolyam titkosítása (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>alapértelmezett titkosírások használata jelölőnégyzetet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Eszközök</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Fiók eszközök kezelése</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Eszköz hozzáadása gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Eszköz hozzáadása</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Fiók exportálása a hálózaton</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Jelszó szövegbevitel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Jelszó (kötelező)</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Fiók exportálásának visszavonása összekapcsoláshoz gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Mé_gse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Ahhoz hogy új eszközt adjon a Jami fiókjához, exportálnia kell a fiókját a hálózaton. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Ellenőrizze a kivitelt a DHT-n készülék összekapcsolása gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>A generált PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Létrehozott PIN-kód az összekapcsoláshoz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Ezt a PIN-kódot kell beírni az új eszközön 5 percen belül. Létrehozhatunk egy újat bármikor.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>PIN-kód létrehozásának elfogadása és kilépés gomb</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Rendben</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Letiltott kapcsolatok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Tiltott kapcsolatok fiók kezelő lap</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Nyilvános cím</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA tanúsítvány</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Média</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Felhasználói tanúsítvány</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Videó engedélyezése</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Személyes kulcs</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Videókodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Személyes kulcs jelszó</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Hangkodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Alapértelmezett cipherek használata</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Hangfájlok (*aiff *.mp3 *.ogg *.opus *.wav *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Fiók hozzáadása</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Egyéni csengőhang hozzáadása</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ A Jami egy biztonságos és osztott csevegőprogram.</translation>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Hívás beállítások</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Hívások engedélyezése ismeretlen kapcsolatoktól</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Hívások önműködő fogadása</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Egyéni csengőhang engedélyezése</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Egyéni csengőhang hozzáadása</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Kiszolgálói néve</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT beállítások</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Meghatalmazott engedélyezése</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Betöltés</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Biztonság</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Személyes kulcs jelszava</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Felhasználói tanúsítvány</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>nincs jelszó</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Személyes kulcs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA tanúsítvány</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Kapcsolódás</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>TURN cím</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN használata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN cím</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>TURN felhasználónév</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>TURN jelszó</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>UPnP használata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>TURN használata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Média</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Videó engedélyezése</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Hangkodekek</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Videókodekek</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Hangfájlok (*aiff *.mp3 *.ogg *.opus *.wav *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ A Jami egy biztonságos és osztott csevegőprogram.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Letiltott kapcsolatlistája</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Tiltott azonosító</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Letiltott kapcsolat feloldása</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Feloldja a kapcsolatot és hozzáadja a kapcsolatlistához</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Társalgások megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Társalgások</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Keresés kapcsolati szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ Ez az Ön azonosítója.
 Másolja és ossza meg a barátaival!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Jami azonosító QR-kód mutatása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Ring azonosító megosztó gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Kattintson duplán a másolásra</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Hiba a QR kód generálása közben</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>legjobb név</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>legjobb azonosító</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Vissza a főoldalra gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Hozzáadás a kapcsolatokhoz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Meghívók megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Meghívók</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Keressen új vagy meglévő kapcsolatot</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Beszélni akar önnel!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Bejövő hívás fogadása gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Bejövő hívás figyelmen kívül hagyása gomb</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Válaszol</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Figyelmen kívül hagy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Kimenő hívás visszavonása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Videóhívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Hanghívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Társalgás törlése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Kapcsolat eltávolítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Kapcsolat letiltása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Szám másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Megérkezett meghívások keresése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Lépjen kapcsolatba velem a Jami-n</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Az azonosítóm:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Bejövő üzenet a következőtől: %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Bejövő hívás tőle: %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Párbeszédpanel</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Új kapcsolat</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Név beírása…</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,47 +525,52 @@ Másolja és ossza meg a barátaival!</translation>
         <translation>Fiók eltávolítása</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Tényleg törli ezt az fiókot?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Ha ezt a fiókot nem exportálták vagy hozzáadták egy másik eszközhöz, akkor ez el fog veszni.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Fiók végleges törlése</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Törlés</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Fiók eltávolítás megszakítása</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Mé_gse</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>Nyomógomb</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>ez az eszköz</translation>
     </message>
 </context>
 <context>
@@ -1154,59 +592,69 @@ Másolja és ossza meg a barátaival!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Feladó</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Párbeszédpanel</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Új eszköz hozzáadása</translation>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Új eszköz hozzáadásához adja meg a fiókjának jelszót:</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Rendben</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Belép</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Fiók exportálása a hálózaton…</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Az előállított PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN-kód</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Ezt a PIN-kódot és a fiók jelszót 5 percen belül be kell írni a eszközbe.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Hibás fiók jelszót</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Csatlakoztasson másik eszközt</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Hibás jelszó</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>Valami hiba történt.
@@ -1216,17 +664,17 @@ Próbálja meg újra később.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
@@ -1236,6 +684,69 @@ Próbálja meg újra később.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Bejegyzett név beállítása</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Jelszó szövegbevitel</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Jelszó beírása</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Bejegyez</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Mégse</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Bezárás</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Hibás jelszó</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Hálózati hiba</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +765,62 @@ Próbálja meg újra később.</translation>
         <translation>Isten hozott</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Üdvözlő jelkép</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Jami fiók létrehozása gomb</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Nyomógomb a Jami fiók létrehozás indításának aktivizálásához </translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Jami fiók létrehozása</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Összekapcsoló eszköz gombja</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Nyomógomb a készülék összekapcsolásának indítási triggerjére</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Ezen eszköz összekapcsolása egy fiókhoz</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Ezen eszköz egy létező fiókhoz kapcsolása</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +843,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Kapja meg a szükséges PIN-kódot az űrlap kitöltéséhez. A PIN-kód csak érvényes &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 percig&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Adja meg a PIN-kódját:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Vagy egy fájl importálása:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Exportált fiók összekapcsolása archív fájlból</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Nincs)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Jelszó:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profilnév</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Fiók</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1369,138 +897,195 @@ Ez fenntartja a felhasználónevet, hogy csak Ön tudja használni.
 Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító használata helyett.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Nyilvános felhasználónév jelölőnégyzet</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Válassza ki a jelölőnégyzetet, ha a felhasználó nyilvános felhasználónevet szeretne</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Nyilvános felhasználónév bejegyeztetése</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Nyilvános felhasználónév szerkesztés</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Válasszon egy felhasználónevet</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Jelszó szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Jelszó beírása</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Jelszó megerősítési szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Jelszó megerősítése</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP fiók </translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Meghatalmazott</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>SIP felhasználónév bevitel</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Felhasználónév</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Jami fiók létrehozása…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Előző oldal gombja</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>nyomógomb az előző oldal hozzáférésének varázslója</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Vissza</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Fiók létrehozása-/összekapcsolása megszakítása</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>nyomja meg a gombot a fiók létrehozása-/összekapcsolása megszakításához</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Vissza</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Következő oldal gombja</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Nyomógomb a következő oldal hozzáférésének varázslója</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Tovább</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami archív fájlok (*.gz); Minden fájl (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Fiók átvitel szükséges. Adja meg a jelszavát.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Jami fiók migrációja…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Fiók archívum importálása…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Jami fiók létrehozása…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Hiba a fiók létrehozása során</translation>
     </message>
@@ -1513,37 +1098,32 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
         <translation>Fiók jelszóváltoztatása</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Adja meg a  jelenlegi jelszót</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Új jelszó megadása</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Új jelszó megerősítése</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Megerősítés</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Sikeres jelszóváltoztatás</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Hibás jelenlegi jelszót</translation>
     </message>
@@ -1564,17 +1144,17 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Fénykép automata kijelző</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Képfájlok (*.jpeg *.jpg *.png)</translation>
     </message>
@@ -1582,12 +1162,12 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Fájlok (*)</translation>
     </message>
@@ -1595,83 +1175,30 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Nem találtam alapértelmezett levelezőügyfélt</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Eszköznév szerkesztése</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Ezen eszköz fiókhoz kikapcsolása</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Kapcsolat letiltás feloldása</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami fiók</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Bejegyzett név beállítása</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Biztosan meg akarja bejegyeztetni ezt a nevet?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Egyszer összekötött ehhez a fiókhoz, nem módosítható.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Az új bejegyzett neve:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Bejegyeztetés megerősítése</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Mégse</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Név bejegyeztetése sikeres!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Valami hiba történt.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Próbálja meg újra később</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Nincs bejegyzett név a fiókodnak</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1682,49 +1209,6 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
         <translation>Mappa kijelölése</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Megtestesülés kép megváltoztatása</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Mentés</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Készítsen egy képet</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Fényképezőgép</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Jelöljön ki egy fájlt</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Mégse</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Kép megnyitása</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Képfájlok (*.bmp *.jpeg, *.jpg, *.png)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1733,283 +1217,315 @@ Ismerősei képesek lesznek felhívni a felhasználónevét az azonosító haszn
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Fiók</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Hang/Videó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Rendszer</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>értesítések engedélyezése jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Az asztali értesítések engedélyezése</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>bezáráskor legyen minimalizálva jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Bezáráskor legyen minimalizálva</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Letöltés mappa</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Felvételek</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Mentés helye</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Mindig legyen felvétel</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Frissítések</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Automatikus frissítés ellenőrző jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Frissítések keresése minden</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Időközönkénti frissítések ellenőrzése napi választó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation> nap</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Frissítések ellenőrzése most gomb</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Frissítések ellenőrzése most</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Bejegyzett név</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>Azonosító</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Engedélyezés</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Személyazonosság</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Azonosító</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Bejegyzett név</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Adja meg a felhasználónév bejegyeztetése ide</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Bejegyez</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Jelszó megváltoztatása</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Fiók exportálása</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Fiók törlése</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Összekapcsolt eszközök</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Csatlakoztasson másik eszközt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation>Letiltott kapcsolatok</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Haladó fiókbeállítások</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP fiók </translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Felhasználónév</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Kiszolgálónév</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Meghatalmazott</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Audió bemeneti eszköz választó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Kimeneti eszköz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Válasszon ki egy kimeneti eszközt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Videó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Eszköz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Videó eszköz választó</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Felbontás</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Videó eszköz felbontás választó</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Előnézet nem elérhető hívás közben</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Adja meg a megjelenítési nevet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>A bejegyzett névnek nem szabad szóközt lennie, és legalább három betűnek kell lennie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>A név már foglalt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>A bejegyzett név már foglalt</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Ez a név elérhető</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Bejegyeztetés ezt a nevet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Eszköz eltávolítása</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Adja meg a fiók jelszót ehhez eszköz eltávolításának megerősítéséhez</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Kérjük, erősítse meg, hogy szeretné eltávolítani ezt az eszközt</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Fiók exportálása ide</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Letöltés célmappájának választása</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Felvétel célmappájának választása</translation>
     </message>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index c2c060d..ce5cb02 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Akun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Kata sandi baru</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Tambah sebagai kontak</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Salin nomor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Akun</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Kembali</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Selanjutnya</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Akun</translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Akun</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index f034409..1158c40 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nome Host</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nome utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numero di voicemail</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Risposta automatica alle chiamate</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP attivato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nuovo password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Cambia password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Play</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codec audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codec video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanzato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrazione</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Timeout di espirazione della registrazione (seconds):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfaccia di rete</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Identico alle impostazioni locali</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Digitare l&apos;indirizzo pubblicato e il porto:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Connettività</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Usare STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Usare TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negoziazione sessione SDP (sostituto a ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Questi parametri sono usati unicamente durante la negoziazione di una sessione SDP nel caso in cui ICE non è sopportato dal server o peer.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Intervallo porti audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Massimo</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Attivare Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Intervallo porti video RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sicurezza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Aggiungi dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Esporta sulla rete</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Il tuo pin generato:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Indirizzo di publicazione</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificato dell&apos;autorita</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificato utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Chiave privata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Password della chiave privata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Usare il cifrario di default</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Innesco</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Password della chiave privata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connettività</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Usare STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Usare TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Usare TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Attivare Video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Converzazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Aggiungi contatti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blocca contatto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copia il numerp</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
-        <source>Contact me on Jami</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="944"/>
-        <source>My Id is : </source>
+        <location filename="../callwidget.cpp" line="943"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
+        <location filename="../callwidget.cpp" line="943"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nuovo contatto</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Esportazione account in corso</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Il tuo pin generato:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Register</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Errore di rete</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Crea un account Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Collega questo dispositivo a un account</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Collega questo dispositivo a un account esistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Inserisci il tuo pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>O importa un file:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confermare password</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Account SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nome utente</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Generare il tuo account Jami ...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Indietro</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Seguente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
+        <translation>Scarica la cartella</translation>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Salvare</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Profilo</translation>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Generale</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sistema</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
-        <translation>Scarica la cartella</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Registrando</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Register</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Account SIP</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nome utente</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nome Host</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index def7862..30b6759 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -56,643 +56,105 @@ Jami è un software di comunicazione sicuro e distribuito.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Opzioni</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nome utente registrato pubblico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numero voicemail</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Risposta automatica alle chiamate</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP abilitato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Impostazioni dell &apos;account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Permetti chiamate da sconosciuti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Permetti chiamate dai contatti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Permetti chiamate dalla cronologia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configurazione generale delle informazioni sull&apos;account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nome visualizzato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Ingresso alias visualizzato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>URL del nome host per bootstrap DHT o SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nome utente pubblico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL del servizio di nomi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Nome dell&apos;URL del servizio di assistenza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Input del nome utente SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Immissione password SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Ingresso URL proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numero della segreteria SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Casella di risposta alla chiamata automatica</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Casella di controllo abilitata UPnP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Vecchia linea di immissione della password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Inserisci la vecchia password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Vecchia password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Nuova immissione di testo tramite password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Inserisci una nuova password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nuova password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Inserimento di testo di conferma della password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Conferma di inserimento</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Nuova conferma della password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Cambia password</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Modifica password ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Permetti la chiamata da una casella di controllo sconosciuta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Consenti casella di controllo da cronologia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Seleziona suoneria</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Riproduci il pulsante della suoneria</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Avvia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>selettore di file suoneria</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configurazione delle preferenze dei codec audio / video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codec audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codec video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avanzato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurazione avanzata dell&apos;account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrazione</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Scadenza timeout di registrazione (secondi):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfaccia di rete</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Porta locale</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Aggiungi account</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Uguale ai parametri locali</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Imposta l&apos;indirizzo pubblicato e la porta:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Utilizza STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL del server</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1716"/>
-        <source>Use TURN</source>
-        <translation>Utilizza TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negoziazione sessione SDP (usa ICE in caso contrario)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Queste impostazioni vengono utizzate solo durante la negoziazione della sessione SDP nel caso in cui ICE non sia supportato dal server o dal peer.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Intervallo porte audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Intervallo porte video RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sicurezza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Crittografia Media Stream (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gestione dei dispositivi account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Aggiungi il pulsante del dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Aggiungi dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Esporta sulla rete</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Password (richiesta)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Per aggiungere un nuovo dispositivo al tuo account Jami, esporta il tuo account sulla rete. Questo genererà un pin che deve essere inserito sul nuovo dispositivo entro 5 minuti dalla sua generazione.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Convalida l&apos;esportazione su DHT per il pulsante di collegamento del dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Il pin generato per te:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN generato per il collegamento</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Questo pin deve essere inserito sul nuovo dispositivo entro 5 minuti. Puoi generarne uno nuovo in qualsiasi momento.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation> Contatti vietati</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Scheda di gestione dei contatti vietati dall&apos;account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Indirizzo Pubblico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificato CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificato Utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Chiave Privata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Password Chiave Privata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Usa il cifrario di default</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Aggiungi account</translation>
-    </message>
 </context>
 <context>
     <name>AdvancedSettingsWidget</name>
@@ -702,138 +164,142 @@ Jami è un software di comunicazione sicuro e distribuito.</translation>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Impostazioni di chiamata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Consenti chiamate da peer non attendibili</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Risposta automatica alle chiamate</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Abilita suoneria personalizzata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Aggiungi una suoneria personalizzata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nome Server</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configurazione OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Abilita proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Avvio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Password della Chiave Privata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificato Utente</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>nessuna password</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Chiave privata</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificato CA.</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connettività</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Utilizza STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation>Usa UPnP</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Utilizza TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation>Usa UPnP</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Utilizza TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codec audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codec Video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>File audio (* .wav * .ogg * .opus * .mp3 * aiff * wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami è un software di comunicazione sicuro e distribuito.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Modulo</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Elenco dei contatti vietati</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID vietato</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Mostra conversazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,181 +361,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Mostra codice ID ring e QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Condividi il pulsante ID ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Fare doppio clic per copiare</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Errore durante la generazione del Codice QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>miglior nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>miglior ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Torna al pulsante homepage</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Aggiungi alla rubrica</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Mostra inviti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Inviti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Trova un contatto nuovo o esistente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Vuole parlare con te!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Inizia la video chiamata</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Avvia chiamata audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Pulisci conversazione</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Rimuovi contatto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blocca contatto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copia numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Cerca i tuoi inviti ricevuti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contattami su Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Il mio ID è:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Messaggio in arrivo da %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Chiamata in arrivo da %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nuovo Contatto</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Inserisci un nome ...</translation>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Chiamata in arrivo da %1</translation>
     </message>
 </context>
 <context>
@@ -1090,46 +523,51 @@ Copy and share it with your friends!
         <translation>Cancellazione dell&apos;account</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Vuoi veramente cancellare il seguente account?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Se questo account non è stato esportato o aggiunto a un altro dispositivo, verrà perso in modo irrevocabile.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Elimina definitivamente l&apos;account</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Modulo</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1152,79 +590,88 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Modulo</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Aggiungi un nuovo dispositivo</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Per aggiungere un nuovo dispositivo, inserisci la password del tuo account:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Annulla</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Il pin generato per te:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Chiudi</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>La tua password dell&apos;account non era corretta</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Qualcosa è andato storto.
-Riprova più tardi.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Info</translation>
     </message>
@@ -1234,6 +681,69 @@ Riprova più tardi.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1252,47 +762,62 @@ Riprova più tardi.</translation>
         <translation>Benvenuto a</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logo di benvenuto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Crea un account Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Collega questo dispositivo ad un account</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Collega questo dispositivo ad un account esistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,49 +831,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Inserire il pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>O importa un file:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1356,138 +883,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registra nome utente pubblico</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Inserimento di testo di conferma della password</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Generare il tuo account Jami ...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Indietro</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Prossimo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Apri File</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Il tuo account deve essere migrato. Inserisci la tua password.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Migrazione del tuo account Jami ...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importazione dell&apos;archivio dell&apos;account ...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Sto&apos; generando il tuo account Jami ...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Errore nella creazione dell&apos;account</translation>
     </message>
@@ -1500,37 +1084,32 @@ instead of using your ID.</source>
         <translation>Cambia password account</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Immetti la password corrente</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Inserire una nuova password</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Conferma la nuova password</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Conferma</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Password cambiata con successo</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Password attuale errata</translation>
     </message>
@@ -1551,17 +1130,17 @@ instead of using your ID.</source>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Scegli un file</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>File immagine (* .jpg * .jpeg * .png)</translation>
     </message>
@@ -1569,12 +1148,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Scegli un file</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Files (*)</translation>
     </message>
@@ -1582,84 +1161,31 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Nessun client E-Mail di Default</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Modifica nome dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Sblocca contatto</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Account Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Imposta il nome registrato</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Sei sicuro di voler registrare questo nome?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Il tuo account non ha un nome registrato</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1669,49 +1195,6 @@ instead of using your ID.</source>
         <translation>Seleziona cartella</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Cambia la tua immagine Avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Salva</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Fai una foto</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Videocamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Seleziona un file</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Apri immagine</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>File immagine (* .jpg * .jpeg * .png * .bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1720,283 +1203,315 @@ instead of using your ID.</source>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Minimizza alla chiusura</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Scarica la cartella</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Registrazioni</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Salva in</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nome Registrato</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Password</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Collega un altro dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Contatti bloccati</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Impostazioni avanzate account </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfono</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo di Uscita</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Risoluzione</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Anteprima non disponibile durante la chiamata</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Un nome registrato non deve contenere spazi e deve contenere almeno tre lettere</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Questo nome è già stato scelto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Questo nome registrato è già stato scelto</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Questo nome è disponibile</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Registra questo nome</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Rimuovi dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Inserisci la password di questo account per confermare la rimozione di questo dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Si prega di confermare che si desidera rimuovere questo dispositivo</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Esporta account qui</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Seleziona una cartella per i tuoi download</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Seleziona una cartella per le tue registrazioni</translation>
     </message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index a86abd5..d9783d1 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>全般</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>アカウント</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>種類</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>パラメーター</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>ホスト名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>ユーザー名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>パスワード</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>プロキシ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>ボイスメール番号</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>自動応答呼び出し</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP 有効</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>名前サービス URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>新しいパスワード</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>再生</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>音声/動画</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>詳細</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>登録</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>ネットワークインターフェイス</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>ローカルパラメーターと同じ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>アドレス</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>ポート番号</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>TURNを使用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>音声 RTP ポートの範囲</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>最小</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>最大</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>セキュリティ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>端末</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>発行されたアドレス</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>メディア</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>動画を有効化</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>プライベートキー</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>ビデオコーデック</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>ブートストラップ</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>セキュリティ</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>秘密鍵のパスワード</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>ユーザー証明書</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>TURNを使用</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>TURNを使用</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>メディア</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>動画を有効化</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>ビデオコーデック</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>会話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,180 +360,157 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>連絡先に追加</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>応答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>番号をコピー</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
-        <source>My Id is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
+        <location filename="../callwidget.cpp" line="943"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ContactDialog</name>
     <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>このデバイス</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>登録</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>ネットワークエラー</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>このデバイスをアカウントへリンク</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>プロフィール</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>アカウント</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>パスワードの再入力</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIPアカウント</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>プロキシ</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>戻る</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>次へ</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>アカウントの作成中にエラーが発生しました</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>設定</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>アカウント</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>全般</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>システム</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>保存</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>カメラ</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>キャンセル</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>アカウント</translation>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>全般</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>システム</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>録音</translation>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>プロフィール</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>保存</translation>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>登録</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>登録された名前</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>パスワード</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIPアカウント</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>ユーザー名</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>ホスト名</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>プロキシ</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>音声</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>動画</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>端末</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index 58c9216..c0e2c80 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>설정</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>일반</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>계정</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>유형</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>인자들</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>호스트명</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>사용자명</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>암호</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>프록시</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>음성메일 번호</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>자동 응답 횟수</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP 가능여부</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>모르는 사람과 통화 허용</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>연락처 등록된 사람과 통화 허용</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>통화이력으로부터 통화 허용</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>공개 사용자명</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>블록체인에 등록</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>네임 서비스 URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>확인</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>통화음 선택</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>재생</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>오디오/비디오</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>오디오 코덱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>비디오 코덱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>등록</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>등록 유효 시간(초):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>네트워크 인터페이스</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>서식</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>공개 주소와 포트 설정하기</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>주소</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>포트</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>STUN 사용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>서버 URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>TURN 사용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>최소</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>최대</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>비디오 RTP 포트 범위</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>보안</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>미디어 스트림 암호화 (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>장치</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>장치 추가하기</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>암호 (필수)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>취소</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>이 PIN 번호는 5분 안에 새로운 장비에 입력해야 합니다. 언제든지 새로운 번호를 다시 생성할 수 있습니다.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>차단한 연락처</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>공개 주소</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>개인키</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>개인키 암호</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>기본 ciphers 사용하기</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>보안</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN 사용</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>TURN 사용</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>TURN 사용</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>차단한 ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>차단 해제 후 연락처 목록에 추가</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,180 +360,157 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>더블클릭으로 복사하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>QR 생성 중 오류</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>연락처에 추가하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>당신과 이야기하고 싶어합니다!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>응답</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>무시</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>%1로부터 메시지</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
+    </message>
     <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>새 연락처</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>서식</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>암호</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>확인</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>설정</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>종료</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>암호</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>이 장치를 계정에 연결하기</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>프로필</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>계정</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>사용자명 선택</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>암호 확인</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>프록시</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>사용자명</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>이전</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>다음</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>파일 열기</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>당신의 계정은 이전이 필요합니다. 암호를 입력하세요.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>파일 선택하기</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>파일 선택하기</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>파일들 (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>기본 메일 클라이언트를 찾을 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>서식</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>설정</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>계정</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>취소</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>일반</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
+        <translation>닫을 때 최소화 유지하기</translation>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>취소</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>서식</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>설정</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>계정</translation>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
+        <translation>지금 업데이트 확인하기</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>일반</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>암호</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
-        <translation>닫을 때 최소화 유지하기</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>프로필</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
-        <translation>지금 업데이트 확인하기</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>암호</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>차단한 연락처</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>사용자명</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>호스트명</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>프록시</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>출력 장치</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>비디오</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>장치</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>해상도</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 0b82e7b..18ff238 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -56,642 +56,104 @@ Jami yra apsaugota ir paskirstytoji bendravimo programinė įranga.</translation
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Bendra</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Paskyra</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametrai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Kompiuterio vardas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Naudotojo vardas</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Slaptažodis</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Pridėti paskyrą</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Įgaliotasis serveris</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Balso pašto numeris</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Skambučio nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation>Automatiškai atsiliepti į skambučius</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP įjungta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Paskyros nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Leisti skambučius nuo nepažįstamųjų</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Leisti skambučius nuo adresatų</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Leisti skambučius iš istorijos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Bendros paskyros informacijos konfigūracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Viešasis naudotojo vardas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registruoti blokų grandinėje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Vardų paslaugos URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Senasis slaptažodis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Naujas slaptažodis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Pakeisti slaptažodį</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Gerai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Atsisakyti slaptažodžio pakeitimo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Keičiamas slaptažodis ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Skambučio melodijos pasirinkimas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Groti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Garsas/Vaizdas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Garso/vaizdo kodekų nuostatų konfigūracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Garso kodekai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Vaizdo kodekai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Išplėstiniai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Išplėstinė paskyros konfigūracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Registracijos galiojimo pabaigos laiko limitas (sekundžių):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Tinklo sąsaja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Vietinis prievadas:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Toks pats kaip vietiniai parametrai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Nustatyti paskelbtą adresą ir prievadą:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Prievadas</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Įjungti tinkintą skambučio melodiją</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Jungiamumas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>STUN adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Naudoti STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Serverio URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>Naudoti UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Naudoti TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Sritis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP seanso derėjimasis (ICE surogatas)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Šie nustatymai yra naudojami tik SDP seanso derėjimosi metu tuo atveju, jei serveris arba naudotojas nepalaiko ICE.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Garso RTP prievadų rėžis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Maž.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Didž.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Vaizdo RTP prievadų rėžis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Saugumas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Paskyros saugumo konfigūracija</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Medija srauto šifravimas (SRTP)</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Medija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Įrenginiai</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Įjungti vaizdą</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Paskyros įrenginių tvarkymas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Pridėti įrenginį</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Slaptažodis (būtinas)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Atsisakyti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Jūsų sukurtas pin:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Susiejimui skirtas sugeneruotas PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Šis PIN per 5 minutes turėtų būti įvestas jūsų naujame įrenginyje. Naują PIN galite sukurti bet kuriuo metu.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Gerai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Užblokuoti adresatai</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Paskelbtas adresas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>LĮ liudijimas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Naudotojo liudijimas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privatusis raktas</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Vaizdo kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Privačiojo rakto slaptažodis</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Garso kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Naudoti numatytuosius šifrus</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Garso failai (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Pridėti paskyrą</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Pridėti tinkintą skambučio melodiją</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami yra apsaugota ir paskirstytoji bendravimo programinė įranga.</translation
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Skambučio nustatymai</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Automatiškai atsiliepti į skambučius</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Įjungti tinkintą skambučio melodiją</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Pridėti tinkintą skambučio melodiją</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Vardų serveris</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT konfigūracija</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Įjungti įgaliotąjį serverį</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Pradinė įkeltis</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Saugumas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Privačiojo rakto slaptažodis</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Naudotojo liudijimas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>nėra slaptažodžio</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Privatusis raktas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>LĮ liudijimas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Jungiamumas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        TURN adresas</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Naudoti STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN adresas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        TURN naudotojo vardas</translation>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation>Naudoti UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        TURN slaptažodis</translation>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Naudoti TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation>Naudoti UPnP</translation>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Medija</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Naudoti TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Įjungti vaizdą</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Garso kodekai</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Vaizdo kodekai</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Garso failai (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami yra apsaugota ir paskirstytoji bendravimo programinė įranga.</translation
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Užblokuotų adresatų sąrašas</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Atblokuoti adresatą ir pridėti į adresatų sąrašą</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Pokalbiai</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Ieškoti adresato</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -908,183 +364,160 @@ Nukopijuokite jį ir dalinkitės juo su savo draugais!
                                       </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Spustelėkite du kartus, norėdami nukopijuoti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Klaida, kuriant QR kodą</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Pridėti prie adresatų</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Rasti naują ar esamą adresatą</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Nori su jumis pakalbėti!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Atsiliepti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Nepaisyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Pradėti vaizdo skambutį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Pradėti garso skambutį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Išvalyti pokalbį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Šalinti adresatą</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Užblokuoti adresatą</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Gauta žinutė nuo %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Gaunamasis skambutis nuo %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogas</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Naujas adresatas</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Įveskite vardą...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1093,48 +526,53 @@ Nukopijuokite jį ir dalinkitės juo su savo draugais!
         <translation>Paskyros ištrynimas</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Ar tikrai norite ištrinti šią paskyrą?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Jeigu ši paskyra nebuvo eksportuota ar pridėta į kitą įrenginį, ji bus negrįžtamai prarasta.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Ištrinti paskyrą visiems laikams</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Ištrinti</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Atsisakyti paskyros ištrynimo</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>šis įrenginys</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1155,59 +593,69 @@ Nukopijuokite jį ir dalinkitės juo su savo draugais!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialogas</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Pridėti naują įrenginį</translation>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Norėdami pridėti naują įrenginį, įveskite savo paskyros slaptažodį:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Gerai</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Eksportuojama paskyra</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Jūsų sukurtas pin:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Šis PIN ir paskyros slaptažodis per 5 minutes turėtų būti įvesti jūsų įrenginyje.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Užverti</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Jūsų paskyros slaptažodis buvo neteisingas</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Susieti kitą įrenginį</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Neteisingas slaptažodis</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>Kažkas nutiko.
@@ -1217,17 +665,17 @@ Vėliau bandykite dar kartą.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Išeiti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Apie</translation>
     </message>
@@ -1237,6 +685,69 @@ Vėliau bandykite dar kartą.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Nustatyti registruotą vardą</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registruoti</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Užverti</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Neteisingas slaptažodis</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Tinklo klaida</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1255,47 +766,62 @@ Vėliau bandykite dar kartą.</translation>
         <translation> Sveiki atvykę į</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Susikurkite Jami paskyrą</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Susikurti Jami paskyrą</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Susiekite įrenginį</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Susieti šį įrenginį su paskyra</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Susieti šį įrenginį su esama paskyra</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1318,49 +844,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Taip gausite šiai formai reikalingą PIN kodą. PIN galios tik &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minučių&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Įveskite savo pin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Arba importuokite failą:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Susieti iš eksportuotos paskyros archyvo failo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Nėra)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Slaptažodis:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profilis</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profilio pavadinimas</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1371,138 +899,195 @@ galėsite jį naudoti. Jūsų draugai galės jums skambinti,
 vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registruoti viešąjį naudotojo vardą</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Pasirinkite savo naudotojo vardą</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Patvirtinkite slaptažodį</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP paskyra</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Įgaliotasis serveris</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Naudotojo vardas</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Kuriama jūsų Jami paskyra…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Ankstesnis puslapis</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Ankstesnis</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Atgal</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Kitas puslapis</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Kitas</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Atverti failą</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami archyvų failai (*.gz); Visi failai (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Jūsų paskyra turi būti perkelta. Įveskite savo slaptažodį.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Perkeliama jūsų Jami paskyra...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importuojamas paskyros archyvas...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Kuriama jūsų Jami paskyra...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Klaida, kuriant paskyrą</translation>
     </message>
@@ -1515,37 +1100,32 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
         <translation>Pakeisti paskyros slaptažodį</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Įveskite dabartinį slaptažodį</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Įveskite naują slaptažodį</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Pakartokite naują slaptažodį</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Patvirtinti</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Slaptažodis sėkmingai pakeistas</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Dabartinis slaptažodis neteisingas</translation>
     </message>
@@ -1566,17 +1146,17 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Nuotraukų budelės rodinys</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Paveikslų failai (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1584,12 +1164,12 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
@@ -1597,83 +1177,30 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Numatytoji pašto kliento programa nerasta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Taisyti įrenginio pavadinimą</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Atsieti įrenginį nuo paskyros</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Atblokuoti adresatą</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami paskyra</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Nustatyti registruotą vardą</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Ar tikrai norėtumėte užregistruoti šį vardą?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Susiejus jį su paskyra, jo daugiau nebegalėsite pakeisti.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Jūsų naujas registruotas vardas būtų:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Patvirtinti registraciją</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Atsisakyti</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Vardas buvo sėkmingai užregistruotas!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Kažkas nutiko.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Vėliau bandykite dar kartą</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Jūsų paskyra neturi registruoto vardo</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1684,49 +1211,6 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
         <translation>Pasirinkti aplanką</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Pasikeisti avataro paveikslą</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Įrašyti</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Padaryti nuotrauką</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Pasirinkti failą</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Atsisakyti</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Atverti paveikslą</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Paveikslų failai (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1735,283 +1219,315 @@ vietoj jūsų ID naudodami jūsų naudotojo vardą.</translation>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Bendra</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Garsas / Vaizdas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Įjungti darbalaukio pranešimus</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Užvėrus, palikti suskleistą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Atsiuntimų aplankas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Įrašai</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Įrašyti į</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Visada įrašinėti</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Atnaujinimai</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Automatiškai tikrinti ar yra atnaujinimų kas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>d.</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Tikrinti dabar ar yra atnaujinimų</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registruotas vardas</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Įjungti</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profilis</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Tapatybė</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Rašykite, norėdami registruoti vardą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registruoti</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Pakeisti slaptažodį</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Eksportuoti paskyrą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Ištrinti paskyrą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Susieti įrenginiai</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Susieti kitą įrenginį</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation>Užblokuoti adresatai</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Išplėstiniai paskyros nustatymai</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP paskyra</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Naudotojo vardas</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Kompiuterio vardas</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Įgaliotasis serveris</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Garsas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofonas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Išvesties įrenginys</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vaizdas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Įrenginys</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Raiška</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Skambučio metu, peržiūra neprieinama</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Registruotame varde negali būti tarpų ir jis privalo būti bent 3 raidžių ilgio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Šis vardas jau yra užimtas</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Registruotas vardas jau užimtas</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Šis vardas yra prieinamas</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Registruoti šį vardą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Šalinti įrenginį</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Įveskite šios paskyros slaptažodį, kad patvirtintumėte šio įrenginio šalinimą</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Patvirtinkite, kad norite pašalinti šį įrenginį</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Eksportuoti paskyrą čia</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Pasirinkite atsiuntimų aplanką</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Pasirinkite įrašų aplanką</translation>
     </message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 5e4225f..3784496 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Aturan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Utama</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Akaun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Jenis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Butiran</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Alamat server</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nama pengguna</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Kara laluan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proksi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Nombor peti suara</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Jawab panggilan automatik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP diaktifkan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Benarkan Panggilan Daripada TidaK Diketahui</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Benarkan Panggilan Daripada Kenalan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Benarkan Panggilan Daripada Sejarah</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Kata laluan baharu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Pilihan Nada Bunyi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Main</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codec Audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codec Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Lanjut</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Pendaftaran</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Guna TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Jarak Port Bunyi RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Penyulitan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Perangkat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Batal</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Alamat server pengagihan</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Aktifkan panggilan video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Penyulitan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Kata laluan untuk fail Private Key</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Guna TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Guna TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Aktifkan panggilan video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Tambahkan sebagai kenalan</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Salin nombor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Hapus</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Tetapan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Tentang</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Daftar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Rangkaian gagal</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Sambungkan perangkat ini dengan akaun</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Akaun</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Kara laluan</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Sahkan kata laluan</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proksi</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nama pengguna</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Gagal mencipta akaun</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Tetapan</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Akaun</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Batal</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Utama</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Batal</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Tetapan</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Akaun</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Utama</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>Sistem</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Rakaman</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Daftar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Kara laluan</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nama pengguna</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Alamat server</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proksi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Bunyi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 9b1435f..1e058b8 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Innstillinger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generell</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parameter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Vertsnavn</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Brukernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Mellomtjener</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Talepostkassenummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Auto-svar på samtaler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktivt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Tillat anrop fra ukjente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Tillat anrop fra kontakt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Tillat samtale fra historikk</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Grunnleggende kontoinfo-oppsett</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Vist navn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Vist alias-inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Vertsnavn-URL for DHT-oppstartsprosedyre eller SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Offentlig brukernavn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Registrer brukernavn på blokkjede-knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrer på blokkjeden</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Nettadresse for navnetjeneste</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Navnetjenestenettadresse-inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP-brukernavn -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP-passord -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP-mellomtjener -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP-talepostkassenummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Autosvar anrop -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>UPnP aktivert -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Inndatalinje for gammelt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Skriv inn gammelt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Gammelt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Tekstinndata for nytt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Skriv inn nytt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nytt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Passordsbekreftelsestekst-inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Inndatabekreftelse</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Bekreftelse av nytt passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Endre passord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Knapp for avbryting av passordsendring</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Endrer passord…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Tillat anrop fra ukjente -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Tillat anrop fra historikk -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Tillat anrop fra kontakt -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Ringetonevalg</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Spill av ringetone -knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Spill av</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>ringetonefilvalg</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/bilde</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Oppsett av foretrukne lyd-/video -kodek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Lydkodek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videokodek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avansert</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Avansert kontooppsett</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tidsgrense for registrering (sekunder):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Registreringstidsavbruddvelger-tallboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Nettverksgrensesnitt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokal port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>lokal portvelger -tallboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>samme som lokal radioknapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Samme som lokale parametre</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>personaliser adresse og porter -radioknapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Oppgi publisert adresse og port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>tekstinntasting for IP-adresse</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>portvelger -tallboks</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>bruk STUN-avkryssningsboks</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Bruk STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Nettadresse for tjener</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>bruk TURN-avkryssningsboks</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Bruk TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>TURN-tjenernettadresse -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>TURN-tjenerbrukernavn -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>TURN-tjenerpassord -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>TURN-tjenerområde -inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Område</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP-øktforhandling (ICE-reserve)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Disse innstillingene brukes kun for SDP-øktforhandling hvis ICE ikke støttes av tjeneren til motparten.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>RTP-portintervall for tale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Nedre grense for RTP-portlydområdevelger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maks.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Øvre grense for RTP-portlydområdevelger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>RTP-portintervall for video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Sikkerhet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Kontosikkerhetsoppsett</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Sertifikatsmyndighetssertifikat-velger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Brukersertifikat-velger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>privat nøkkelpassord-inndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Privat nøkkel for bruker-velger</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Krypter mediastrøm (SRTP)-avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediastrømkryptering (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>bruk forvalgt krypteringsalgoritme-avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Kontoenhetsbehandling</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Legg til enhet-knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Legg til enhet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Passordstekstinndata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Passord (kreves)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Avbryt kontoeksport for lenking -knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Verifisert eksporter på DHT for enhetslenking -knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Din genererte PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Generert PIN for sammenlenking</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Denne PIN-koden må skrives inn på din nye enhet i løpet av fem minutter. Du kan generere en ny hvert øyeblikk.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Godta PIN-generering og avslutt-knapp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Bannlyste kontakter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Behandling av kontakter som er bannlyst fra kontoen -fane</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Publisert adresse</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-sertifikat</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Brukersertifikat</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privat nøkkel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Passord for privatnøkkel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Bruk forvalgte krypteringsalgoritmer</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Skru på mellomtjener</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Sikkerhet</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Privat nøkkel-passord</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Brukersertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Bruk STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Bruk TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Bruk TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Lydkodeker</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Video-kodeker</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Liste over bannlyste kontakter</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Bannlyst ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Fjern bannlysning av kontakt -knapp</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Fjern bannlysning av kontakt, og legg til i kontaktliste</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Søk etter kontakttekst -inndata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Vis QR-kode for ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Del ring ID -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklikk for å kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Feil ved generering av QR-kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Tilbake til hjemmeside -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Legg til kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Ønsker å snakke med deg!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Svar innkommende anrop -knapp </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Ignorer innkommende anrop -knapp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Svar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Avbryt utgående anrop</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Fjern kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopier nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Melding ankommer fra %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Innkommende anrop fra %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogvindu</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Innkommende anrop fra %1</translation>
     </message>
 </context>
 <context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Skjema</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Din genererte PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Lukk</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Velkomstlogo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Lenk enhet -knapp</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trykknapp for start av enhetslinking -utløser</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lenk denne enheten til en konto</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Lenk denne enheten til en eksisterende konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Skriv inn din PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Eller importer fil:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Lenk fra eksportert kontoarkivfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Offentlig brukernavn -avkryssningsboks</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Avkryssningsboks som velger hvorvidt en bruker ønsker et offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrer offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Redigering av offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Velg ditt brukernavn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Passordstekstinndata</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Passordteksinnskriving</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Passordsbekreftelsestekst-inndata</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Bekreft passord</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Forrige side -knapp</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>trykkbar knapp for å nå forrige side av veivisning</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Forrige</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Tilbake</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Neste side -knapp</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Trykk på knappen for å komme til neste side i veivisningen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Neste</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Kontoen din må flyttes. Skriv inn passordet ditt.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importerer kontoarkiv…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Fotoboksvisning</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Velg fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Velg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Fant ingen forvalgt e-postklient</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation>Velg mappe</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Lagre</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>skru på merknader -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>behold minimisert ved lukking -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Behold minimert ved lukking</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Nedlastingsmappe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Opptak</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Lagre i</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Automatisk oppdateringssjekker -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Intervall mellom oppdateringssjekker i dager -velger</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Se etter oppdateringer nå -knapp</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Se etter oppdateringer nå</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registrert navn</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Aktivèr</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Lydinndataenhets-velger</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Utgangsenhet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Videoenhetsvelger</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Oppløsning</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Videoenhets-oppløsnings-velger</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Forhåndsvisning utilgjengelig under samtale</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index f858b2a..e1c63d3 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -56,642 +56,104 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parameters</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Openbaar geregistreerde gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Voicemailnummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Oproepen automatisch beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ingeschakeld</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Accountinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Oproepen van onbekenden toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Oproepen van contacten toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Oproepen van gebruikers in oproepgeschiedenis toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuratie van algemene accountinformatie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Getoonde naam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Getoonde aliasinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Hostnaam-URL voor DHT-bootstrap of SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Openbare gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Knop gebruikersnaam registreren op de blokketen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registreren op blokketen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Naamdienst-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Invoer voor naamdienst-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP-gebruikersnaaminvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP-wachtwoordinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP-proxy-URL-invoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP-voicemailnummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Selectievakje oproepen automatisch beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Selectievakje UPnP ingeschakeld</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Invoerregel oude wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Voer uw oude wachtwoord in</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Oud wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Tekstinvoer nieuw wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Voer uw nieuwe wachtwoord in</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nieuw wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Wachtwoordbevestigingstekstinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Invoerbevestiging</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Bevestiging nieuwe wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Wachtwoord wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Oké</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Knop wachtwoordwijziging annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Wachtwoord wijzigen…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Selectievakje oproepen van onbekenden toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Selectievakje oproepen uit oproepsgeschiedenis toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Selectievakje oproepen uit contacten toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Beltoonselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Knop beltoon afspelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Afspelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>selectie beltoonbestand</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuratie voor audio-/videocodecvoorkeuren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audiocodecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videocodecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Geavanceerd</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Geavanceerde accountconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tijdslimiet voor registratieverval (seconden):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Spinveld registratietime-outselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netwerkinterface</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokale poort:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>spinveld lokalepoortselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>keuzerondje gelijk aan lokaal</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Gelijk aan lokale parameters</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>keuzerondje adres en poorten personaliseren</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Account toevoegen</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Stel gepubliceerd adres en poort in:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>tekstinvoer IP-adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Poort</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>spinveld poortselectie</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>selectievakje STUN gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>STUN gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server-URL</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>selectievakje TURN gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>TURN gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Invoer TURN-server-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Invoer TURN-server-gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Invoer TURN-server-wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Invoer TURN-server-Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP-sessieonderhandeling (ICE-terugvaloptie)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Deze instellingen worden enkel gebruikt tijdens SDP-sessieonderhandelingen ingeval ICE niet ondersteund wordt door de server of de gebruiker.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Audio RTP-poortenreeks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Selectie ondergrens voor audio-RTP-poortbereik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>selectie bovengrens voor audio-RTP-poortbereik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Video RTP-poortenreeks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Beveiliging</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Accountbeveiligingsconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Selectie certificeringsinstantiecertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Selectie gebruikerscertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>invoer wachtwoord geheime sleutel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Selectie persoonlijke sleutel van gebruiker</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Selectievakje mediastream versleutelen (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediastreamversleuteling (SRTP)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>selectievakje standaardcodering gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Apparaten</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Accountapparaatbeheer</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Knop apparaat toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Apparaat toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exporteren op het netwerk</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Wachtwoordtekstinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Wachtwoord (vereist)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Knop account exporteren voor koppelen annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Om een nieuw apparaat aan uw Jami-account toe te voegen, dient u uw account te exporteren op het netwerk. Dit zal een pincode genereren die u binnen 5 minuten op uw nieuwe apparaat dient in te voeren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Knop export op DHT voor apparaten koppelen bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Uw gegenereerde pincode:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Pincode gegenereerd voor koppelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>Pincode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>U dient deze pincode op uw nieuwe apparaat binnen 5 minuten in te voeren. U kunt op elk moment een nieuwe code genereren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Knop pin genereren accepteren en afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Oké</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Geblokkeerde contacten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Tabblad accountbeheer verbannen contacten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Gepubliceerd adres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-certificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Gebruikerscertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Geheime sleutel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Wachtwoord geheime sleutel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Standaardcodering gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Account toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Oproepinstellingen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Oproepen van onvertrouwde gebruikers toestaan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Oproepen automatisch beantwoorden</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Aangepaste beltoon inschakelen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Voeg een aangepaste beltoon toe</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Naamserver</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT-configuratie</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Proxy inschakelen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Wachtwoord persoonlijke sleutel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Gebruikerscertificaat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>geen wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Privésleutel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA-certificaat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connectiviteit</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        TURN-adres</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN-adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        TURN-gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        TURN-wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>UPnP gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>TURN gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Audiocodecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Videocodecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Audiobestanden (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lijst met geblokkeerde contacten</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Geblokkeerd ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Knop verbanning contact opheffen</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Contact deblokkeren en toevoegen aan contactenlijst</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Gesprekken tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ Copy and share it with your friends!
 Kopieer en deel het met uw vrienden!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Toon QR-code voor Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Knop Ring-ID delen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklik om te kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij het aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>beste naam</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>beste ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Knop terug naar startpagina</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Toevoegen aan contacten</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Uitnodigingen tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Uitnodigingen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Zoek een nieuw of bestaand contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Wil met u praten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Knop inkomende oproep beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Knop inkomende oproep negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Video-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Audio-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Gesprek wissen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Contact verwijderen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Contact blokkeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Zoek naar uw ontvangen uitnodigingen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contacteer me op Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Mijn ID is:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Inkomend bericht van %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nieuw contact</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Voer een naam in...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,47 +525,52 @@ Kopieer en deel het met uw vrienden!</translation>
         <translation>Accountverwijdering</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Weet u zeker dat u het volgende account wilt verwijderen?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Als dit account nog niet geëxporteerd is of nog niet toegevoegd is aan een ander apparaat, zal het onherroepelijk verloren gaan</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Account voorgoed verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Accountverwijdering annuleren</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulier</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>PushKnop</translation>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1154,79 +592,88 @@ Kopieer en deel het met uw vrienden!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Voeg een nieuw apparaat toe</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Voer uw accountwachtwoord in om een nieuw apparaat toe te voegen:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Invoeren</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Account wordt geëxporteerd op het netwerk</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Uw gegenereerde pincode:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>U dient deze pincode en het accountwachtwoord binnen 5 minuten op uw nieuwe apparaat in te voeren.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Sluiten</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Uw accountwachtwoord is verkeerd</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Er ging iets mis.
-Probeer het later opnieuw.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
@@ -1236,6 +683,69 @@ Probeer het later opnieuw.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +764,62 @@ Probeer het later opnieuw.</translation>
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Knop Jami-account aanmaken</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Trekker voor starten van aanmaken van Jami-account na druk op knop</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Een Jami-account aanmaken</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trekker voor koppelen van apparaat na druk op knop</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Dit apparaat aan een account koppelen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Dit apparaat aan een bestaand account koppelen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +842,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minuten&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt; geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Voer uw pincode in:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Of importeer een bestand:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Koppelen van geëxporteerd accountarchiefbestand</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(geen)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profielnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1370,138 +897,195 @@ Uw vrienden zullen u kunnen bellen met uw gebruikersnaam
 in plaats van uw Ring-ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Selectievakje openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Selectievakje om te kiezen of de gebruiker een openbare gebruikersnaam wil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registreer een openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Bewerken openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Kies uw gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Wachtwoordbevestigingstekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Uw Jami-account wordt aangemaakt…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Knop vorige pagina</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>druk op de knop om naar de vorige pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Aanmaken/koppelen van account annuleren</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>trekker voor annuleren van aanmaken of verwijderen van account</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Knop volgende pagina</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Druk op de knop om naar de volgende pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami-archiefbestanden (*.gz); Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Uw account moet gemigreerd worden. Voer uw wachtwoord in.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Uw Jami-account wordt gemigreerd…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Accountarchief importeren…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Uw Jami-account wordt aangemaakt…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Fout bij aanmaken van account</translation>
     </message>
@@ -1514,37 +1098,32 @@ in plaats van uw Ring-ID.</translation>
         <translation>Accountwachtwoord wijzigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Voer huidig wachtwoord in</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Voer nieuw wachtwoord in</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Bevestig nieuw wachtwoord</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Bevestigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Wachtwoord gewijzigd</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Huidige wachtwoord is verkeerd</translation>
     </message>
@@ -1565,17 +1144,17 @@ in plaats van uw Ring-ID.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Fotoautomaatweergave</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Afbeeldingsbestanden (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1583,12 +1162,12 @@ in plaats van uw Ring-ID.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1596,83 +1175,30 @@ in plaats van uw Ring-ID.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Geen standaard-e-mailprogramma gevonden</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Apparaatnaam bewerken</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Apparaat ontkoppelen van account</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Contact deblokkeren</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami-account</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Stel geregistreerde naam in</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Weet u zeker dat u deze naam wilt registreren?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Eenmaal geassocieerd met dit account, kan deze niet meer gewijzigd worden</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Uw nieuwe geregistreerde naam wordt:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Registratie bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>De naam is met succes geregistreerd!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Er ging iets mis.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Probeer het later opnieuw</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Uw account heeft geen geregistreerde naam</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1683,49 +1209,6 @@ in plaats van uw Ring-ID.</translation>
         <translation>Kies een map</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Wijzig uw avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Opslaan</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Foto maken</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Camera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Selecteer een bestand</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Afbeelding openen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Afbeeldingsbestanden (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1734,283 +1217,315 @@ in plaats van uw Ring-ID.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio/video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>selectievakje meldingen inschakelen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Bureaubladmeldingen inschakelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>selectievakje minimaliseren bij sluiten</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Minimaliseren bij sluiten</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Downloadmap</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Opnamen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Opslaan in</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Altijd opnemen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Selectievakje automatisch controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Automatisch controleren op updates elke</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Selectie interval in dagen tussen controles op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Knop nu controleren op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Nu controleren op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Geregistreerde naam</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Inschakelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Typ hier om een gebruikersnaam te registreren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Wachtwoord wijzigen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Account exporteren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Account verwijderen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Gekoppelde apparaten</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Een ander apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Geblokkeerde contacten</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Geavanceerde accountinstellingen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfoon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Selectie audio-invoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Kies het uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Selectie video-apparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolutie</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Selectie video-apparaatresolutie</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Voorbeeldweergave niet beschikbaar gedurende oproep</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Voer de getoonde naam in</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Een geregistreerde naam mag geen spaties bevatten, en moet minstens drie tekens lang zijn</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Deze naam is reeds in gebruik</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Deze geregistreerde naam is reeds in gebruik</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Deze naam is beschikbaar</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Deze naam registreren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Apparaat verwijderen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Voer het wachtwoord van dit account in om het verwijderen van dit apparaat te bevestigen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Bevestig dat u dit apparaat wilt verwijderen</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Account hier exporteren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Selecteer een map voor uw downloads</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Kies een map voor uw opnamen</translation>
     </message>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index a836702..e47a727 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -56,642 +56,104 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parameters</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Openbaar geregistreerde gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Voicemailnummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Oproepen automatisch beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ingeschakeld</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Accountinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Oproepen van onbekenden toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Oproepen van contacten toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Oproepen van gebruikers in oproepgeschiedenis toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuratie van algemene accountinformatie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Getoonde naam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Getoonde aliasinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Hostnaam-URL voor DHT-bootstrap of SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Openbare gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Knop gebruikersnaam registreren op de blokketen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registreren op blokketen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Naamdienst-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Invoer voor naamdienst-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP-gebruikersnaaminvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP-wachtwoordinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP-proxy-URL-invoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP-voicemailnummer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Selectievakje oproepen automatisch beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Selectievakje UPnP ingeschakeld</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Invoerregel oude wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Geef uw oude wachtwoord in</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Oud wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Tekstinvoer nieuw wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Geef uw nieuwe wachtwoord in</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nieuw wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Wachtwoordbevestigingstekstinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Invoerbevestiging</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Bevestiging nieuw wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Wachtwoord wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Oké</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Knop wachtwoordwijziging annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Wachtwoord wijzigen…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Selectievakje oproepen van onbekenden toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Selectievakje oproepen uit oproepsgeschiedenis toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Selectievakje oproepen uit contacten toestaan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Beltoonselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Knop beltoon afspelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Afspelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>selectie beltoonbestand</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuratie voor audio-/videocodecvoorkeuren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Audiocodecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videocodecs</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Geavanceerd</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Geavanceerde accountconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tijdslimiet voor registratieverval (seconden):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Spinveld registratietime-outselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Netwerkinterface</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokale poort:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>spinveld lokalepoortselectie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>keuzerondje gelijk aan lokaal</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Gelijk aan lokale parameters</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>keuzerondje adres en poorten personaliseren</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Account toevoegen</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Stel gepubliceerd adres en poort in:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>tekstinvoer IP-adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Poort</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>spinveld poortselectie</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>selectievakje STUN gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>STUN gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Server-URL</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>selectievakje TURN gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>TURN gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Invoer TURN-server-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Invoer TURN-server-gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Invoer TURN-server-wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Invoer TURN-server-Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Realm</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP-sessieonderhandeling (ICE-terugvaloptie)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Deze instellingen worden enkel gebruikt tijdens SDP-sessieonderhandelingen ingeval ICE niet ondersteund wordt door de server of de gebruiker.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Audio RTP-poortenreeks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Selectie ondergrens voor audio-RTP-poortbereik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>selectie bovengrens voor audio-RTP-poortbereik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Video RTP-poortenreeks</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Beveiliging</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Accountbeveiligingsconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Selectie certificeringsinstantiecertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Selectie gebruikerscertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>invoer wachtwoord geheime sleutel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Selectie persoonlijke sleutel van gebruiker</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Selectievakje mediastream versleutelen (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediastreamversleuteling (SRTP)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>selectievakje standaardcodering gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Apparaten</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Accountapparaatbeheer</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Knop apparaat toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Apparaat toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exporteren op het netwerk</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Wachtwoordtekstinvoer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Wachtwoord (vereist)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Knop account exporteren voor koppelen annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Om een nieuw apparaat aan uw Jami-account toe te voegen, moet u uw account exporteren op het netwerk. Dit zal een pincode genereren die u binnen de 5 minuten op uw nieuwe apparaat moet ingeven.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Knop export op DHT voor apparaten koppelen bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Uw gegenereerde pincode:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Pincode gegenereerd voor koppelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>Pincode</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>U moet deze pincode op uw nieuw apparaat binnen de 5 minuten ingeven. U kunt op eender welk moment een nieuwe code genereren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Knop pin genereren aanvaarden en afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Oké</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Geblokkeerde contacten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Tabblad accountbeheer verbannen contacten</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Gepubliceerd adres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-certificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Gebruikerscertificaat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Geheime sleutel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Wachtwoord geheime sleutel</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Standaardcodering gebruiken</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Account toevoegen</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Oproepinstellingen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Oproepen van onvertrouwde gebruikers toestaan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Oproepen automatisch beantwoorden</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Aangepaste beltoon inschakelen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Voeg een aangepaste beltoon toe</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Naamserver</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT-configuratie</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Proxy inschakelen</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Wachtwoord persoonlijke sleutel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Gebruikerscertificaat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>geen wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Privésleutel</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA-certificaat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Connectiviteit</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        TURN-adres</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN-adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        TURN-gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        TURN-wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>UPnP gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>TURN gebruiken</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Audiocodecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Videocodecs</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Audiobestanden (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami is software voor beveiligde en gedistribueerde communicatie.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lijst met geblokkeerde contacten</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Geblokkeerde ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Knop verbanning contact opheffen</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Contact deblokkeren en toevoegen aan contactenlijst</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Gesprekken tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami is vrije software voor universele communicatie, die de vrijheden en privacy van zijn gebruikers eerbiedigt.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ Copy and share it with your friends!
 Kopieer en deel hem met uw vrienden!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Toon QR-code voor Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Knop Ring-ID delen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklik om te kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij het aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>beste naam</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>beste ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Knop terug naar startpagina</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Toevoegen aan contacten</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Uitnodigingen tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Uitnodigingen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Zoek een nieuw of bestaand contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Wilt met u praten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Knop inkomende oproep beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Knop inkomende oproep negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Video-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Audio-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Gesprek wissen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Contact verwijderen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Contact blokkeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Zoek naar uw ontvangen uitnodigingen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contacteer mij op Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Mijn ID is:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Inkomend bericht van %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nieuw contact</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Geef een naam in...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,47 +525,52 @@ Kopieer en deel hem met uw vrienden!</translation>
         <translation>Accountverwijdering</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Weet u zeker dat u de volgende account wilt verwijderen?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Als deze account nog niet geëxporteerd is of nog niet toegevoegd is aan een ander apparaat, zal hij onherroepelijk verloren gaan</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Account voorgoed verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Accountverwijdering annuleren</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulier</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>PushKnop</translation>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1154,79 +592,88 @@ Kopieer en deel hem met uw vrienden!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Voeg een nieuw apparaat toe</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Geef uw accountwachtwoord in om een nieuw apparaat toe te voegen:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Ingeven</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Account wordt geëxporteerd op het netwerk</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Uw gegenereerde pincode:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>U moet deze pincode en het accountwachtwoord binnen de 5 minuten op uw nieuwe apparaat ingeven.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Sluiten</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Uw accountwachtwoord is verkeerd</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Er is iets misgegaan.
-Herprobeer het later.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
@@ -1236,6 +683,69 @@ Herprobeer het later.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +764,62 @@ Herprobeer het later.</translation>
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Knop Jami-account aanmaken</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Trekker voor starten van aanmaken van Jami-account na druk op knop</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Een Jami-account aanmaken</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Trekker voor koppelen van apparaat na druk op knop</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Dit apparaat aan een account koppelen</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Dit apparaat aan een bestaande account koppelen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +842,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minuten&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt; geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Geef uw pincode in:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Of importeer een bestand:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Koppelen van geëxporteerd accountarchiefbestand</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(geen)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profielnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1370,138 +897,195 @@ Uw vrienden zullen u kunnen bellen met uw gebruikersnaam
 in plaats van uw Ring-ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Selectievakje openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Selectievakje om te kiezen of de gebruiker een openbare gebruikersnaam wil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registreer een openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Bewerken openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Kies uw gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Wachtwoordtekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Wachtwoordbevestigingstekstinvoer</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Uw Jami-account wordt aangemaakt…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Knop vorige pagina</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>druk op de knop om naar de vorige pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Aanmaken/koppelen van account annuleren</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>trekker voor annuleren van aanmaken of verwijderen van account</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Knop volgende pagina</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Druk op de knop om naar de volgende pagina van de assistent te gaan</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami-archiefbestanden (*.gz); Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Uw account moet gemigreerd worden. Geef uw wachtwoord in.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Uw Jami-account wordt gemigreerd…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Accountarchief importeren…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Uw Jami-account wordt aangemaakt…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Fout bij aanmaken van account</translation>
     </message>
@@ -1514,37 +1098,32 @@ in plaats van uw Ring-ID.</translation>
         <translation>Accountwachtwoord wijzigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Geef huidig wachtwoord in</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Geef nieuw wachtwoord in</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Bevestig nieuw wachtwoord</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Bevestigen</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Wachtwoord gewijzigd</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Huidige wachtwoord is verkeerd</translation>
     </message>
@@ -1565,17 +1144,17 @@ in plaats van uw Ring-ID.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Fotoautomaatweergave</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Afbeeldingsbestanden (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1583,12 +1162,12 @@ in plaats van uw Ring-ID.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1596,83 +1175,30 @@ in plaats van uw Ring-ID.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Geen standaard-e-mailprogramma gevonden</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Apparaatnaam bewerken</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Apparaat ontkoppelen van account</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Contact deblokkeren</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami-account</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Stel geregistreerde naam in</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Weet u zeker dat u deze naam wilt registreren?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Eenmaal geassocieerd met deze account, kan deze niet meer gewijzigd worden</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Uw nieuwe geregistreerde naam wordt:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Registratie bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>De naam is met succes geregistreerd!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Er is iets misgegaan.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Herprobeer het later</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Uw account heeft geen geregistreerde naam</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1683,49 +1209,6 @@ in plaats van uw Ring-ID.</translation>
         <translation>Kies een map</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Wijzig uw avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Opslaan</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Foto maken</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Camera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Selecteer een bestand</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Afbeelding openen</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Afbeeldingsbestanden (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1734,283 +1217,315 @@ in plaats van uw Ring-ID.</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio/video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>selectievakje meldingen inschakelen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Bureaubladmeldingen inschakelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>selectievakje minimaliseren bij sluiten</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Minimaliseren bij sluiten</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Downloadmap</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Opnamen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Opslaan in</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Altijd opnemen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Selectievakje automatisch controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Automatisch controleren op updates elke</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Selectie interval in dagen tussen controles op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Knop nu controleren op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Nu controleren op updates</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Geregistreerde naam</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Inschakelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Typ hier om een gebruikersnaam te registreren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Wachtwoord wijzigen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Account exporteren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Account verwijderen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Gekoppelde apparaten</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Een ander apparaat koppelen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Geblokkeerde contacten</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Geavanceerde accountinstellingen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfoon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Selectie audio-invoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Kies het uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Selectie video-apparaat</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolutie</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Selectie video-apparaatresolutie</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Voorbeeldweergave niet beschikbaar gedurende oproep</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Geef de getoonde naam in</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Een geregistreerde naam mag geen spaties bevatten, en moet minstens drie tekens lang zijn</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Deze naam is reeds in gebruik</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Deze geregistreerde naam is reeds in gebruik</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Deze naam is beschikbaar</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Deze naam registreren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Apparaat verwijderen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Geef het wachtwoord van deze account in om het verwijderen van dit apparaat te bevestigen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Bevestig dat u dit apparaat wilt verwijderen</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Account hier exporteren</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Selecteer een map voor uw downloads</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Kies een map voor uw opnamen</translation>
     </message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 3ffda4a..09bf0f9 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Gebruikersnaam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Spelen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Gevorderd</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Beveiliging</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Voeg toe aan contacten</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopieër nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Beeld</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 2db3878..a157795 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>ਸੈਟਿੰਗ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
+        <source>Private Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
+        <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
-        <source>Private Key</source>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
-        <source>CA Certificate</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
-        <source>Connectivity</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>ਮਿਟਾਓ</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>ਸੈਟਿੰਗ</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 6ff0a86..51ba38a 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -56,642 +56,104 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generalne</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametry</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nazwa hosta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Publicznie zarejestrowana nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Pełnomocnik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numer poczty głosowej</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Automatyczne odbieraj połączenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP jest włączone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Ustawienia Konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Zezwól Na Połączenia Od Nieznanych</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Zezwól Na Połączenia Od Kontaku</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Zezwól Na Połączenia Od Historii</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Ustawienia ogólne konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Wyświetlana nazwa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Wprowadź wyświetlaną nazwę</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Adres URL dla bootstrapu DHT lub SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Publiczna nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Zarejestruj nazwę użytkownika w blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Zarejestruj w blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL serwera nazw</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>URL serwera nazw</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Wprowadź nazwę użytkownika SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Wprowadź hasło użytkownika SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Wprowadź adres URL proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numer poczty głosowej SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Pole automatycznego odbierania połączeń</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Pole zezwolenia na UPnP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linia wprowadzania starego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Wprowadź stare hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Stare hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Pole wprowadzania nowego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Wprowadź nowe hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nowe hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Pole potwierdzenia hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Wprowadź potwierdzenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Potwierdzenie nowego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Zmień hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Guzik anulowania zmiany hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Zmienianie hasła...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Pole zezwolenia otrzymywania połączeń od nieznajomych</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Pole zezwolenia na z historii połączeń</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Pole zezwolenia rozmów z listy kontaktów</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Wybierz Dzwonek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Guzik odtwarzania dzwonka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Graj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Wybór pliku dzwonka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Ustawienia kodeków audio/wideo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Kodeki audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Kodeki wideo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Zaawansowana konfiguracja konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Rejestracja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Limit czasu do rejestracji (w sekundach) :</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Pole wyboru odstępu pomiędzy rejestracjami</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfejs Sieciowy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Port lokalny:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>Pole wyboru lokalnego portu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>guzik &quot;tak samo jak lokalnie&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Tak samo jak lokalne parametry.</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>guzik personalizacji adresu i portu</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Dodaj Konto</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Ustaw opublikowany adres i port:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Ustawienia Połączeń</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>pole wprowadzania adresu ip</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>Automatycznie Odbieraj Połączenia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Użyj Własnego Dzwonka</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>pole wyboru portu</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Łączność</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>checkbox używaj STUN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>Adres STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Użyj STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>serwer URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>checkbox używaj TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>Użyj UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Użyj TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>pole adresu URL serwera TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>pole nazwy użytkownika serwera TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>pole hasła serwera TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Pole Relam serwera TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>sfera</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negocjacja sesji SDP (użyjcie ICE w przypadku awari)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Te ustawienia są tylko używane podczas negocjacji sesji SDP w przypadku gdzie ICE nie jest obsługiwany przez serwer lub innym użytkownikiem.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Zakres Portów Audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Niższa wartość wartość zakresu dla portu audio RTP </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>wyższa wartość wartość zakresu dla portu audio RTP </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Zakres Portów Wideo RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Zabezpieczenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Konfiguracja bezpieczeństwa konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Pole wyboru certyfikatu użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>pole hasła prywatnego klucza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Pole wyboru prywatnego klucza użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Checkbox szyfrowania strumienia multimedialnego (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Szyfrowanie Strumieni Multimedialnych (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>checkbox używania domyślnego szyfrowania</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Urządzenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Zarządzanie urządzeniami konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Guzik dodawania urządzenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Dodaj urządzenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Wyeksportuj do sieci</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Pole tekstowe hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Hasło (wymagane)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Guzik anulowania eksportu konta w celu połączenia z innym</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Aby dodać nowe urządzenie do konta Jami na innym urządzeniu, musisz wyeksportować konto Jami na urządzeniu macierzystym. Wygenerowany zostanie wtedy pin, który należy wprowadzić na nowym urządzeniu w ciągu 5 minut od jego utworzenia.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Guzik Uwierzytelniania eksportu w DHT dla urządzenia </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Twój wygenerowany PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Wygenerowany kod do połączenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Ten PIN powinien być wprowadzony na twoim nowym urządzeniu w ciągu 5 minut od jego utworzenia.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Guzik akceptowania generowania PINu i zamknięcia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Zablokowane kontakty</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Karta zarządzania zablokowanymi kontaktami</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Opublikowany Adres</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certyfikat CA</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certyfikat użytkownika</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Włącz video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Klucz prywatny</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Kodeki Wideo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Hasło klucza prywatnego</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Kodeki Audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Użyj domyślnych szyfrów</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Pliki Audio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Dodaj Konto</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Dodaj własny dzwonek</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Ustawienia Połączeń</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Zezwól Na Połączenia Od Niezaufanych Użytkowników</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Automatycznie Odbieraj Połączenia</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Użyj Własnego Dzwonka</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Dodaj własny dzwonek</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Serwer Nazw</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Konfiguracja OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Włącz proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Zabezpieczenia</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Hasło Klucza Prywatnego</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certyfikat Użytkownika</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>brak hasła</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Klucz Prywatny</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certyfikat CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Łączność</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>Adres TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Użyj STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Adres STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>Nazwa Użytkownika TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation>Użyj UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>Hasło TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Użyj TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation>Użyj UPnP</translation>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Użyj TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Włącz video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Kodeki Audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Kodeki Wideo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Pliki Audio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lista zablokowanych kontaktów</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Zablokowane ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Guzik odblokowania kontaktu</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Odblokuj kontakt i dodaj do listy kontaktów</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Pokaż rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Pole szukania kontaktów</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ To jest twoje ID.
 Skopiuj i podziel się ze swoimi znajomymi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Pokaż kod QR Jami ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Guzik dzielenia się ID Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Kliknij dwukrotnie, aby skopiować </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>najlepsza nazwa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>Najlepsze ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Guzik powrotu do strony głównej</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Dodaj do kontaków</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Pokaż zaproszenia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Zaprasza</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Szukaj nowego lub istniejącego kontaktu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Chce z tobą rozmawiać!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Guzik odbierania przychodzących rozmów</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Guzik ignorowania nadchodzących połączeń</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Odbierz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Anuluj połączenie wychodzące</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Rozpocznij rozmowę wideo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Rozpocznij połączenie głosowe</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Wyczyść rozmowę</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Usuń kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blokuj kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Skopiuj numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Szukaj odebranych zaproszeń</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Skontaktuj się ze mną na Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Mój identyfikator to:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Przychodząca wiadomość od %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Połączenie przychodzące od %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nowy kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Wpisz nazwę...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,47 +525,52 @@ Skopiuj i podziel się ze swoimi znajomymi!</translation>
         <translation>Kasowanie konta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Czy na pewno chcesz usunąć następujące konto?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Jeżeli to konto nie zostało wyeksportowane, lub dodane do innego urządzenia, zostanie bezpowrotnie utracone.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Usuń konto na zawsze</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Anuluj usuwanie konta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>Guzik do naciskania</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>to urządzenie</translation>
     </message>
 </context>
 <context>
@@ -1154,59 +592,69 @@ Skopiuj i podziel się ze swoimi znajomymi!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Dodaj nowe urządzenie</translation>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Aby dodać nowe urządzenie, wprowadź hasło do swojego konta:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Wprowadź</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Eksportuję konto</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Wyeksportuj konto w sieci</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Twój wygenerowany PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Ten PIN i hasło do konta powinny być wprowadzone na twoim urządzeniu w ciągu 5 minut.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Twoje hasło do konta jest niepoprawne</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Połącz Inne Urządzenie</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Niepoprawne hasło</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>Coś poszło nie tak.
@@ -1216,17 +664,17 @@ Proszę, spróbuj ponownie.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O</translation>
     </message>
@@ -1236,6 +684,69 @@ Proszę, spróbuj ponownie.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Ustaw Zarejestrowaną Nazwę</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Pole tekstowe hasła</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Wpis tekstu hasła</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Zarejestruj</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Niepoprawne hasło</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Błąd sieci</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +765,62 @@ Proszę, spróbuj ponownie.</translation>
         <translation>Witaj!</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logo Powitania</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Guzik tworzenia konta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Guzik do rozpoczęcia tworzenia konta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Stwórz konto Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Guzik łączenia urządzenia</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Guzik do rozpoczęcia połączenia urządzenia</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Połącz to urządzenie z kontem</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Połącz to urządzenie z istniejącym kontem</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +843,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Będziesz potrzebować kodu PIN, aby uzupełnić ten formularz. Kod PIN jest ważny przez&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minut&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Wpisz swój PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Lub zaimportuj plik:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Połącz z wyeksportowanego pliku archiwum </translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Brak)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nazwa profilu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1369,138 +897,195 @@ Ta akcja zarezerwuje nazwę użytkownika, tak, że tylko ty będziesz w stanie z
 Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika zamiast używać twojego ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Checkbox publicznej nazwy użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Checkbox zaznaczający, jeśli użytkownik chce mieć publiczną nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Zarejestruj publiczną nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Edycja publicznej nazwy użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Wybierz swoją nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Pole tekstowe hasła</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Wpis tekstu hasła</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Pole potwierdzenia hasła</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Konto SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Pełnomocnik</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Wprowadź nazwę użytkownika SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nazwa użytkownika</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Tworzenie konta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Guzik poprzedniej strony</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>guzik dostępu do poprzedniej strony instalatora</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Poprzednie</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Anuluj konto stwórz/połącz</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>guzik do anulowania tworzenia lub łączenia konta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Wstecz</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Guzik następnej strony</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Guzik dostępu do następnej strony instalatora</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Następne</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Pliki archiwum Jami (*.gz); Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Twoje konto musi zostać zaktualizowane. Wprowadź swoje hasło.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Migrowanie twojego kąta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importowanie archiwum konta...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Generowanie twojego konta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Błąd podczas tworzenia konta</translation>
     </message>
@@ -1513,37 +1098,32 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
         <translation>Zmień Hasło Konta</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Wprowadź Obecne Hasło</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Wprowadź Nowe Hasło</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Potwierdź Nowe Hasło</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Potwierdź</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Hasło Zmienione Pomyślnie</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Bieżące Hasło Jest Niepoprawne</translation>
     </message>
@@ -1564,17 +1144,17 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Widok z przodu</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Pliki Obrazków (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1582,12 +1162,12 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
@@ -1595,83 +1175,30 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Nie znaleziono domyślnego klienta poczty</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Edytuj Nazwę Urządzenia</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Odłącz Urządzenie Od Konta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Odblokuj Kontakt</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Konto Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Ustaw Zarejestrowaną Nazwę</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Czy na pewno chcesz zarejestrować tą nazwę?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Kiedy zostanie powiązana z tym kontem, nie będzie dało się zmienić.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Twoją nową, zarejestrowaną nazwą byłoby:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Potwierdź Rejestrację</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Nazwa została pomyślnie zarejestrowana!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Coś poszło nie tak.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Proszę, spróbuj później</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Twoje konto nie ma zarejestrowanej nazwy</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1682,49 +1209,6 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
         <translation>Wybierz folder</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Zmień Swój Obrazek Awatara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Zapisz</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Zrób Zdjęcie</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Wybierz Plik</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Otwórz Obrazek</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Pliki Obrazków (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1733,283 +1217,315 @@ Twoi znajomi będą w stanie kontaktować się za pomocą tej nazwy użytkownika
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Wideo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>checkbox włączenia powiadomień</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Zezwól na powiadomienia na pulpicie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>przechowaj zminimalizowane przy zamknięciu</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Przechowaj zminimalizowane przy zamknięciu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Folder pobrane</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Nagrania</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Zapisz w</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Zawsze Nagrywaj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Aktualizacje</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Checkbox automatycznych aktualizacji</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Sprawdzaj automatycznie aktualizacje co</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Pole wyboru interwału pomiędzy sprawdzaniem aktualizacji w dniach</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dni</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Guzik sprawdzenia aktualizacji teraz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Sprawdź aktualizacje teraz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Zarejestrowana nazwa</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Włącz</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Tożsamość</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Zarejestrowana nazwa</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Wpisz tutaj, by zarejestrować nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Zarejestruj</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Zmień Hasło</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Wyeksportuj konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Usuń Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Połączone Urządzenia</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Połącz Inne Urządzenie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation>Zablokowane Kontakty</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Zaawansowane Ustawienia Konta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Konto SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nazwa użytkownika</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Nazwa hosta</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Pełnomocnik</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Pole wyboru urządzenia wejściowego audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Urządzenie Wyjściowe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Wybierz urządzenie wyjściowe</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Urządzenie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Pole wyboru urządzenia wideo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Rozdzielczość</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Pole wyboru rozdzielczości urządzenia wideo</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Podgląd jest niedostępny podczas rozmowy</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Wprowadź wyświetlaną nazwę </translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Zarejestrowana nazwa powinna nie zawierać żadnych spacji i musi mieć przynajmniej 3 litery długości </translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Ta nazwa jest już zajęta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Ta zarejestrowana nazwa jest już zajęta</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Ta nazwa jest dostępna</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Zarejestruj tą nazwę</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Usuń Urządzenie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Wprowadź hasło do tego konta, aby potwierdzić usunięcie tego urządzenia</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Proszę potwierdź, że chcesz usunąć to urządzenie</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Wyeksportuj Konto Tutaj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Wybierz Folder Dla Twoich Pobranych</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Wybierz Folder Dla Twoich Nagrań</translation>
     </message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index 7c6c374..2016d7a 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -56,641 +56,103 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Generalne</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametry</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Nazwa hosta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Publicznie zarejestrowana nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Pełnomocnik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numer poczty głosowej</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Automatyczne odbieraj połączenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP jest włączone</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Ustawienia Konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Zezwól Na Połączenia Od Nieznanych</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Zezwól Na Połączenia Od Kontaku</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Zezwól Na Połączenia Od Historii</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Ustawienia ogólne konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Wyświetlana nazwa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Wprowadź wyświetlaną nazwę</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Adres URL dla bootstrapu DHT lub SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Publiczna nazwa użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Zarejestruj nazwę użytkownika w blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Zarejestruj w blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL serwera nazw</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>URL serwera nazw</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Wprowadź nazwę użytkownika SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Wprowadź hasło użytkownika SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Wprowadź adres URL proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numer poczty głosowej SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Pole automatycznego odbierania połączeń</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Pole zezwolenia na UPnP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linia wprowadzania starego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Wprowadź stare hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Stare hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Pole wprowadzania nowego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Wprowadź nowe hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nowe hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Pole potwierdzenia hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Wprowadź potwierdzenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Potwierdzenie nowego hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Zmień hasło</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Guzik anulowania zmiany hasła</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Zmienianie hasła...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Pole zezwolenia otrzymywania połączeń od nieznajomych</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Pole zezwolenia na z historii połączeń</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Pole zezwolenia rozmów z listy kontaktów</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Wybierz Dzwonek</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Guzik odtwarzania dzwonka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Graj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Wybór pliku dzwonka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Ustawienia kodeków audio/wideo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Kodeki audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Kodeki wideo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Zaawansowana konfiguracja konta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Rejestracja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Limit czasu do rejestracji (w sekundach) :</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interfejs Sieciowy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Port lokalny:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Tak samo jak lokalne parametry.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Ustaw opublikowany adres i port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Użyj STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>serwer URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1716"/>
-        <source>Use TURN</source>
-        <translation>Użyj TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>sfera</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negocjacja sesji SDP (użyjcie ICE w przypadku awari)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Te ustawienia są tylko używane podczas negocjacji sesji SDP w przypadku gdzie ICE nie jest obsługiwany przez serwer lub innym użytkownikiem.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Zakres Portów Audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Zakres Portów Wideo RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Zabezpieczenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Szyfrowanie Strumieni Multimedialnych (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Urządzenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Dodaj urządzenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Wyeksportuj do sieci</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Twój wygenerowany PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Opublikowany Adres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certyfikat CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certyfikat użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Klucz prywatny</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Hasło klucza prywatnego</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Użyj domyślnych szyfrów</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -702,138 +164,142 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Zabezpieczenia</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Hasło Klucza Prywatnego</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certyfikat Użytkownika</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Łączność</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Użyj STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Użyj TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Użyj TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -847,57 +313,47 @@ Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wol
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Forma</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,181 +361,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Dodaj do kontaków</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Chce z tobą rozmawiać!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Odbierz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Usuń kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blokuj kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Skopiuj numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Przychodząca wiadomość od %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Połączenie przychodzące od %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Połączenie przychodzące od %1</translation>
     </message>
 </context>
 <context>
@@ -1090,46 +523,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Forma</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Twój wygenerowany PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +661,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O</translation>
     </message>
@@ -1233,6 +681,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +762,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Połącz to urządzenie z kontem</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Połącz to urządzenie z istniejącym kontem</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,49 +831,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Wpisz swój PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Lub zaimportuj plik:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1355,138 +883,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Zarejestruj publiczną nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Wybierz swoją nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Pole potwierdzenia hasła</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Tworzenie konta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Poprzednie</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Wstecz</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Następne</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1499,37 +1084,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1550,17 +1130,17 @@ instead of using your ID.</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1568,12 +1148,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
@@ -1581,421 +1161,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Nie znaleziono domyślnego klienta poczty</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>konto Jami</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
+        <translation>System</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
+        <translation>Zapisz w</translation>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Generalne</translation>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation>System</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Nagrania</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
-        <translation>Zapisz w</translation>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Zarejestrowana nazwa</translation>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Hasło</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Urządzenie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Rozdzielczość</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index b8ef469..2fc61fb 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -56,642 +56,104 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parâmetros</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nome de utilizador público registado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nome de utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Número do correio de voz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Atender chamadas automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ativado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Configurações da Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Aceitar Chamada de Desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Aceitar Chamada de Contacto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Aceitar Chamada de Histórico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuração das informações gerais da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nome mostrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Entrada de apelido em exibição</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Endereço do servidor para SIP ou inicialização DHT</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nome de utilizador público</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Botão de registar nome de utilizador na cadeia de blocos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registar na cadeia de blocos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL do serviço de nomes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Entrada de URL do serviço de nomes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Entrada de nome de utilizador SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Entrada de palavra-chave SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Entrada de URL do proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Número de correio de voz SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Caixa de visto &quot;Atender chamadas automaticamente&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Caixa de visto &quot;UPnP ativado&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linha de entrada da palavra-chave antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Introduza a palavra-chave antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Palavra-chave Antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Nova entrada de texto de palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Insira a nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Campo de texto para confirmação da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Confirmação de entrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmação da nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Alterar palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Botão de cancelar a alteração da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>A alterar palavra-chave...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Caixa de visto &quot;Aceitar Chamadas de Desconhecidos&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Caixa de visto &quot;Aceitar Chamada do Histórico&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Caixa de seleção &quot;Aceitar Chamadas de Contacto&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Seleção de Toque de Chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Botão de reproduzir toque de chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproduzir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>seletor de ficheiro do toque de chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuração de preferências dos codecs de áudio/vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codecs de áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codecs de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurações avançadas da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tempo de expiração de registo (segundos):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Seletor de tempo limite de registo spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interface da Rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Porta Local:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>seletor de porta local spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>o mesmo que o botão de opção local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Igual aos parâmetros locais</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>botão de opção para personalizar endereço e portas</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Adicionar Conta</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Definir endereço e portas publicadas:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>entrada de texto para endereço IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Porta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>caixa numérica de cimabaixo do seletor de portas</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>caixa de visto de &quot;usar STUN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Usar STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL do servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>caixa de visto de &quot;usar TURN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Usar TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Campo para URL do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Campo para o nome de utilizador do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Campo para a palavra-chave do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Campo para domínio do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Domínio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negociação de Sessão SDP (caso falhe o ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso o ICE não seja suportado pelo servidor ou membro.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Intervalo de portas RTP de áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Mín</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Seletor do intervalo de portas RTP áudio de limites baixos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Máx</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Seletor do intervalo de portas RTP áudio de limites altos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Intervalo de portas RTP de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Segurança</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuração da segurança da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Seletor do certificado de autoridade</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Seletor de certificado do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>entrada de palavra-chave da chave privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Seletor de chave privada do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Caixa de visto para criptografar fluxo de media (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Encriptação do Fluxo de Média (SRTP)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>Caixa de visto para usar cifras padrão</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivos</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gestão de dispositivos de conta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Botão &quot;adicionar dispositivo&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Adicionar dispositivo</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exportar na rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Entrada de texto da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Palavra-chave (necessária)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Cancelar a exportação da conta para o botão de associação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Para adicionar um novo dispositivo à sua conta Jami, deve exportar sua conta na rede. Isso irá gerar um PIN que deve ser introduzido no seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Valida a exportação via DHT para o botão de associação do dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>O seu PIN gerado:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN gerado para associar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Pode ter que gerar um novo a qualquer momento.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Botão &quot;aceitar a geração de PIN e sair&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contactos Banidos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Aba de gestão de contactos banidos da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Endereço Publicado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificado de CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificado de utilizador</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Chave privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Palavra-chave  de chave provada</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Utilizar cifras padrão</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Adicionar Conta</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Configurações de chamadas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Permitir chamadas de utilizadores desconhecidos</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Atender chamadas automaticamente</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Ativar toque de chamada personalizado</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Adicionar um toque de chamada personalizado</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nome do servidor</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configuração OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Ativar Proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Inicialização</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Palavra-chave da Chave Privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificado do Utilizador</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>sem palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Chave privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Conectividade</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        Endereço TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Endereço STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        Nome de utilizador TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        Palavra-chave TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>Usar UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs de áudio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs de vídeo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Ficheiros de áudio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lista de contactos banidos</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID Banido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Botão &quot;desbanir contacto&quot;</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Desbanir e adicionar à lista de contactos</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Ver conversações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para pesquisa de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -908,183 +364,160 @@ Copie-o e partilhe-o com os seus amigos!
                                       </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Botão para partilhar o seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>melhor nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>melhor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Procurar um contacto novo ou existente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar consigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Começar chamada de vídeo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Começar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Limpar conversação</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Remover contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Pesquisar os seus convites recebidos</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contacte-me no Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>O meu ID é:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>A receber mensagem de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>A receber chamada de %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Novo Contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Introduzir um nome...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1093,47 +526,52 @@ Copie-o e partilhe-o com os seus amigos!
         <translation>Eliminação de conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Tem certeza que quer eliminar a seguinte conta?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Se esta conta não foi exportada ou adicionada a outro dispositivo, ela será perdida.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Eliminar conta permanentemente</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Cancelar eliminação da conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulário</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>Botão de pressionar</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1155,79 +593,88 @@ Copie-o e partilhe-o com os seus amigos!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Adicionar um novo dispositivo</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Para adicionar um novo dispositivo, introduza a palavra-chave da sua conta:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Introduzir</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Exportar conta na rede</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>O seu PIN gerado:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Este PIN e a palavra-chave devem ser inseridos no seu novo dispositivo nos próximos 5 minutos.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Fechar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>A sua palavra-chave da conta estava incorreta</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Algo correu mal.
-Por favor tente de novo mais tarde.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
@@ -1237,6 +684,69 @@ Por favor tente de novo mais tarde.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1255,47 +765,62 @@ Por favor tente de novo mais tarde.</translation>
         <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Botão para criar conta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Botão para acionar a criação da conta do Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Criar uma conta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Associar este dispositivo a uma conta existente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1318,49 +843,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Irá obter o PIN necessário para completar este formulário. O código PIN é válido apenas durante &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Introduza o seu PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ou importe um ficheiro:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Link do ficheiro da conta exportada</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(nenhum)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Palavra-chave:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nome do perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1371,138 +898,195 @@ Os seus amigos serão capazes de contactá-lo com seu nome de
 utilizador em vez do seu ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Caixa de visto para o nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Caixa de visto para indicar se o utilizador quer um nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registar nome de utilizador público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Editar nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Escolha o seu nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Campo de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmar palavra-chave</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Botão de página anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>Botão de pressionar para aceder à página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Cancelar a criação de conta / associação</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>botão para cancelar criação de conta ou associação</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Botão de página seguinte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Botão de pressionar para aceder à página seguinte do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Ficheiros de arquivo Jami (*.gz); Todos os ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>A sua conta tem de ser migrada. Introduza a sua palavra-chave.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>A importar ficheiro da conta...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Erro ao criar a conta</translation>
     </message>
@@ -1515,37 +1099,32 @@ utilizador em vez do seu ID.</translation>
         <translation>Alterar a palavra-chave da conta</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Introduzir a palavra-chave atual</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Introduzir a palavra-chave nova</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Confirmar a palavra-chave nova</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Confirmar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>A palavra-chave foi alterada com sucesso</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>A palavra-chave atual está incorreta</translation>
     </message>
@@ -1566,17 +1145,17 @@ utilizador em vez do seu ID.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Mostrar foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1584,12 +1163,12 @@ utilizador em vez do seu ID.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Ficheiros (*)</translation>
     </message>
@@ -1597,83 +1176,30 @@ utilizador em vez do seu ID.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Cliente de e-mail padrão não encontrado</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Editar Nome do Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Desassociar Dispositivo da Conta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Desbloquear Contacto</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Conta Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Definir o nome registado</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Tem a certeza que quer registar este nome?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Após ser associado a esta conta, não pode ser alterado.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>O seu nome registado novo será:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Confirmar registo</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>O nome foi registado com sucesso!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Algo correu mal.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Por favor tente de novo mais tarde</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>A sua conta não tem um nome registado</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1684,49 +1210,6 @@ utilizador em vez do seu ID.</translation>
         <translation>Select folder</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Alterar a imagem do seu avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Salvar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Tirar uma foto</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Câmara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Selecionar um ficheiro</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Abrir uma imagem</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Ficheiros de imagem (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1735,283 +1218,315 @@ utilizador em vez do seu ID.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Áudio / vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Caixa de visto &quot;Ativar notificações&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Ativar notificações no ambiente de trabalho</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Caixa de visto &quot;Manter minimizado ao fechar&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Manter minimizado ao fechar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Pasta de descarregamentos</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Gravações</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Gravar em</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Gravar sempre</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Caixa de visto &quot;Verificar atualizações automaticamente&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Verificar se existem atualizações a cada</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Seletor do intervalo em dias entre verificação de atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Botão para verificar atualizações agora</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Verificar se existem atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nome Registado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Palavra-chave</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Ativar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Escreva aqui para registar um nome</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Alterar palavra-chave</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exportar conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Eliminar conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Dispositivos associados</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Associar outro dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Contactos bloqueados</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Configurações avançadas de conta </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfone</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Seletor de dispositivo de entrada de áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo de Saída</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Escolha o dispositivo de saída</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Seletor de dispositivo de vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolução</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Seletor de resolução do dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Pré-visualização não disponível em chamadas</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Introduza o nome a ser mostrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Um nome registado não deve ter espaços e deve ter no mínimo 3 caracteres</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Este nome já foi escolhido por outra pessoa</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Este nome registado já foi escolhido por outra pessoa</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Este nome está disponível</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Registar este nome</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Remover dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Introduza a palavra-chave desta conta para confirmar a remoção deste dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Por favor confirme que quer remover este dispositivo</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Exportar conta aqui</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Selecionar uma pasta para os seus descarregamentos</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Selecionar uma pasta para as suas gravações</translation>
     </message>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 43d2f49..f14553d 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -56,642 +56,104 @@ Jami é um programa de comunicação seguro e distribuído.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parâmetros</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nome de usuário público registrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nome de usuário</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Número do correio de voz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Chamadas de Auto-Resposta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ativado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Configurações da Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Aceitar Chamada de Desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Aceitar Chamada de Contato</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Aceitar Chamada de Histórico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuração das informações gerais da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nome em exibição</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Entrada de pseudônimo em exibição</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Endereço do servidor para SIP ou DHT</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Usuário publico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Botão de registar usuário no blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrar no blockchain</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL do servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Entrada de URL do serviço de nomes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Entrada de usuário SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Entrada de senha SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Entrada de URL do proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Número de mensagem de voz SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Checkbox do atendimento automático de ligação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Checkbox de ativação UPnP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linha de entrada da senha antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Insira a senha antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Senha antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Nova entrada de texto de senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Insira nova senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Campo de texto para confirmação da Senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Confirmação de entrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmação da nova senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Mudar senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Botão de cancelar a mudança de senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Mudando senha...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Caixa de seleção &quot;permitir chamada de desconhecidos&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Caixa de seleção &quot;Aceitar Chamada do Histórico&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Caixa de seleção &quot;Aceitar Chamada de Contato&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Selecionar toque</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Botão &quot;tocar campainha&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproduzir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>seletor de arquivo da campainha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuração de preferências dos codecs de áudio/vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codecs de Áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codecs de Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurações avançadas da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registro</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tempo de expiração de registro (segundos):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Seletor de tempo limite de registro spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interface de Rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Porta Local:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>seletor de porta local spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>mesmo que botão de rádio local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Igual aos parâmetros locais</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>seletor para personalizar endereço e portas</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Adicionar Conta</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Configurar endereço e portas publicadas:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>entrada de texto para endereço IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Porta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>seletor de porta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Conectividade</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>caixa de seleção &quot;usar STUN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>Endereço STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL do servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>caixa de seleção &quot;usar TURN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Campo para URL do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Campo para nome de usuário do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Campo para senha do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Campo para domínio do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Domínio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negociação de sessão SDP ( ICE Fallback)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso ICE não seja suportado pelo servidor ou membro.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Variação de portas de áudio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Seletor do valor de graves das portas para áudio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Máx</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>limite máximo para o seletor de faixa de porta RTP de áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Intervalo de portas de vídeo RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Segurança</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuração da segurança da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Seletor do certificado de autoridade</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Seletor de certificado do usuário</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>Entrada de senha de chave privada </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Seletor de chave privada do usuário</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Caixa de seleção para criptografar fluxo de mídia (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Criptografia de Fluxo de Mídia (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>Caixa de seleção para usar cifras padrão</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gerenciamento de dispositivos de conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Botão &quot;adicionar dispositivo&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Adicionar dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exportar na rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Entrada de texto de senha</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Senha (necessária)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Cancelar a exportação da conta para o botão de vinculação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Para adicionar um novo dispositivo à sua conta do Jami, você deve exportar sua conta na rede. Isso gerará um PIN que deve ser inserido em seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Valida exportação via DHT para o botão de vinculação de dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Seu PIN gerado:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN gerado para vinculação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Você pode ter que gerar um novo a qualquer momento.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Botão &quot;aceitar a geração de PIN e sair&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contatos Banidos</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Conta banida - aba de gerenciamento de contatos</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Endereço publicado</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificado de CA</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Mídia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificado de usuário</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Habilitar Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Chave Privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Codecs de Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Senha de chave privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Codecs de Áudio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Utilizar cifras padrão</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Arquivos de áudio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Adicionar Conta</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami é um programa de comunicação seguro e distribuído.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Habilitar Proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Inicialização</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Senha chave privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificado do Usuário</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Conectividade</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        Endereço TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Endereço STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Usar TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Usar TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Mídia</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Habilitar Vídeo</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs de Áudio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs de Vídeo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Arquivos de áudio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami é um programa de comunicação seguro e distribuído.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lista de contatos banidos</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID Banido</translation>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Botão &quot;anular banimento de contato&quot;</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Repatriar, e adicionar a lista de contatos</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Mostrar conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para busca de contato </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ Copy and share it with your friends!
 Copiei e compartilhe com seus amigos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Botão para compartilhar o seu Id do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>melhor nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>melhor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contatos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Convida</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar com você!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Iniciar videochamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Iniciar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Eliminar a conversa</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Remover contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloquear contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Encontre-me no Jami !</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Meu Id é : </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Recebendo mensagem de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Recebendo chamada de %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Novo Contato</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,48 +525,53 @@ Copiei e compartilhe com seus amigos!</translation>
         <translation>Remoção de conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Tem certeza que deseja deletar a seguinte conta?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Se esta conta não foi exportada, ou adicionada a outro dispositivo, ela será completamente perdida.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Deletar conta permanentemente</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Deletar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Cancelar deleção da conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>este dispositivo</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1154,59 +592,69 @@ Copiei e compartilhe com seus amigos!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Exportando conta</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Seu PIN gerado:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Senha incorreta</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1215,17 +663,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
@@ -1235,6 +683,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Entrada de texto de senha</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Campo de texto da Senha</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Senha incorreta</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Erro de rede</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1253,47 +764,62 @@ Please try again later.</source>
         <translation>Bem-vindo ao</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logotipo de boas-vindas</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Botão para criar conta do Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Botão para acionar a criação da conta do Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Criar uma conta no Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Associar este dispositivo à uma conta existente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,49 +833,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Entre o seu PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ou importe de arquivo:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Link do arquivo da conta exportada</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nome do perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1357,138 +885,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Caixa de seleção para nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Caixa de seleção para indicar se o usuário deseja um nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrar nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Editar nome de usuário público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Escolha seu nome de usuário</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Entrada de texto de senha</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Campo de texto da Senha</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Campo de texto para confirmação da Senha</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmar senha</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Conta SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Entrada de usuário SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nome de usuário</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Gerando sua conta do Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Botão da página anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>Pressione botão para acessar a página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Botão da próxima página</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Pressione botão para acessar próxima página do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Sua conta precisa ser migrada. Entre com sua senha.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Migrando sua conta do Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Importando arquivo da conta...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Gerando sua conta do Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Erro ao criar conta</translation>
     </message>
@@ -1501,37 +1086,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1552,17 +1132,17 @@ instead of using your ID.</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Exibir foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1570,12 +1150,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Arquivos (*)</translation>
     </message>
@@ -1583,82 +1163,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Cliente de e-mail não encontrado</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Editar Nome do Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Desassociar Este Dispositivo Da Conta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Desbloquear Contato</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Conta Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1670,49 +1197,6 @@ instead of using your ID.</source>
         <translation>Selecionar pasta</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Salvar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Câmera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Abrir imagem</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1721,283 +1205,315 @@ instead of using your ID.</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Áudio / vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Caixa de seleção para habilitar notificações</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Caixa de seleção para manter minimizado ao fechar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Manter minimizado ao fechar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Pasta de downloads</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Gravações</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Salvar em</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Caixa de seleção para verificar atualizações automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Seletor do intervalo da verificação de atualizaçôes em dias</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Botão para verificar atualizações agora</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Checar por atualizações agora</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nome Registrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Habilitar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identificação</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Usuário registrado</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrar</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exportar Conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Contatos Banidos</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Conta SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nome de usuário</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Servidor</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfone</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Seletor de dispositivo de entrada de áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo de saída</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Seletor de dispositivo de vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolução</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Seletor de resolução do dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Pré-visualização não disponível em chamadas</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index 7fffd49..e9969cb 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -56,642 +56,104 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parâmetros</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Nome de utilizador público registado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nome de utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Número do correio de voz</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Atender chamadas automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP ativado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Configurações da Conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Aceitar Chamada de Desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Aceitar Chamada de Contacto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Aceitar Chamada de Histórico</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Configuração das informações gerais da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Nome mostrado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Entrada de apelido em exibição</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>Endereço do servidor para SIP ou inicialização DHT</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Nome de utilizador público</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Botão de registar nome de utilizador na cadeia de blocos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registar na cadeia de blocos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL do serviço de nomes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Entrada de URL do serviço de nomes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Entrada de nome de utilizador SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Entrada de palavra-chave SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Entrada de URL do proxy SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Número de correio de voz SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Caixa de visto &quot;Atender chamadas automaticamente&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Caixa de visto &quot;UPnP ativado&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Linha de entrada da palavra-chave antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Introduza a palavra-chave antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Palavra-chave Antiga</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Nova entrada de texto de palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Insira a nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Campo de texto para confirmação da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Confirmação de entrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Confirmação da nova palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Alterar palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Botão de cancelar a alteração da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>A alterar palavra-chave...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Caixa de visto &quot;Aceitar Chamadas de Desconhecidos&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Caixa de visto &quot;Aceitar Chamada do Histórico&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Caixa de seleção &quot;Aceitar Chamadas de Contacto&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Seleção de Toque de Chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Botão de reproduzir toque de chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Reproduzir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>seletor de ficheiro do toque de chamada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Configuração de preferências dos codecs de áudio/vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Codecs de áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Codecs de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Configurações avançadas da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tempo de expiração de registo (segundos):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Seletor de tempo limite de registo spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Interface da Rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Porta Local:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>seletor de porta local spinbox</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>o mesmo que o botão de opção local</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Igual aos parâmetros locais</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>botão de opção para personalizar endereço e portas</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Adicionar Conta</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Definir endereço e portas publicadas:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>entrada de texto para endereço IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Porta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>caixa numérica de cimabaixo do seletor de portas</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>caixa de visto de &quot;usar STUN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Usar STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL do servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>caixa de visto de &quot;usar TURN&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Usar TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Campo para URL do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Campo para o nome de utilizador do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Campo para a palavra-chave do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Campo para domínio do servidor TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Domínio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negociação de Sessão SDP (caso falhe o ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso o ICE não seja suportado pelo servidor ou membro.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Intervalo de portas RTP de áudio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Mín</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Seletor do intervalo de portas RTP áudio de limites baixos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Máx</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Seletor do intervalo de portas RTP áudio de limites altos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Intervalo de portas RTP de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Segurança</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Configuração da segurança da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Seletor do certificado de autoridade</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Seletor de certificado do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>entrada de palavra-chave da chave privada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Seletor de chave privada do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Caixa de visto para criptografar fluxo de media (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Encriptação do Fluxo de Média (SRTP)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>Caixa de visto para usar cifras padrão</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Dispositivos</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Gestão de dispositivos de conta</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Botão &quot;adicionar dispositivo&quot;</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Adicionar dispositivo</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exportar na rede</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Entrada de texto da palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Palavra-chave (necessária)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Cancelar a exportação da conta para o botão de associação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Para adicionar um novo dispositivo à sua conta Jami, deve exportar sua conta na rede. Isso irá gerar um PIN que deve ser introduzido no seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Valida a exportação via DHT para o botão de associação do dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>O seu PIN gerado:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN gerado para associar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Pode ter que gerar um novo a qualquer momento.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Botão &quot;aceitar a geração de PIN e sair&quot;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Contactos Banidos</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Aba de gestão de contactos banidos da conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Endereço Publicado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Certificado de CA</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Certificado de utilizador</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Chave privada</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Palavra-chave  de chave provada</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Utilizar cifras padrão</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Adicionar Conta</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Configurações de chamadas</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Permitir chamadas de utilizadores desconhecidos</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Atender chamadas automaticamente</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Ativar toque de chamada personalizado</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Adicionar um toque de chamada personalizado</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Nome do servidor</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Configuração OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Ativar Proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Inicialização</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Palavra-chave da Chave Privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Certificado do Utilizador</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>sem palavra-chave</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Chave privada</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Conectividade</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        Endereço TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Endereço STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        Nome de utilizador TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        Palavra-chave TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>Usar UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Codecs de áudio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Codecs de vídeo</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Ficheiros de áudio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ O Jami é um programa de comunicação distribuído e seguro.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Lista de contactos banidos</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID Banido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Botão &quot;desbanir contacto&quot;</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Desbanir e adicionar à lista de contactos</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Ver conversações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para pesquisa de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -908,183 +364,160 @@ Copie-o e partilhe-o com os seus amigos!
                                       </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Mostrar código QR do seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Botão para partilhar o seu ID do Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o Código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>melhor nome</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>melhor Id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Botão para voltar à página inicial</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Mostrar convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Convites</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Procurar um contacto novo ou existente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar consigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Botão para atender chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Botão para ignorar chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Começar chamada de vídeo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Começar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Limpar conversação</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Remover contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Pesquisar os seus convites recebidos</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Contacte-me no Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>O meu ID é:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>A receber mensagem de %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>A receber chamada de %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Novo Contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Introduzir um nome...</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1093,47 +526,52 @@ Copie-o e partilhe-o com os seus amigos!
         <translation>Eliminação de conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Tem certeza que quer eliminar a seguinte conta?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Se esta conta não foi exportada ou adicionada a outro dispositivo, ela será perdida.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Eliminar conta permanentemente</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Cancelar eliminação da conta</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulário</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>Botão de pressionar</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1155,79 +593,88 @@ Copie-o e partilhe-o com os seus amigos!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Adicionar um novo dispositivo</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Para adicionar um novo dispositivo, introduza a palavra-chave da sua conta:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>Introduzir</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Exportar conta na rede</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>O seu PIN gerado:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Este PIN e a palavra-chave devem ser inseridos no seu novo dispositivo nos próximos 5 minutos.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Fechar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>A sua palavra-chave da conta estava incorreta</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Algo correu mal.
-Por favor tente de novo mais tarde.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
@@ -1237,6 +684,69 @@ Por favor tente de novo mais tarde.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1255,47 +765,62 @@ Por favor tente de novo mais tarde.</translation>
         <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Botão para criar conta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Botão para acionar a criação da conta do Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Criar uma conta Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Botão para acionar a associação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Associar este dispositivo a uma conta existente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1318,49 +843,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Irá obter o PIN necessário para completar este formulário. O código PIN é válido apenas durante &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Introduza o seu PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ou importe de um ficheiro:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Link do ficheiro da conta exportada</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(nenhum)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Palavra-chave:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Nome do perfil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1371,138 +898,195 @@ Os seus amigos serão capazes de contactá-lo com seu nome de
 utilizador em vez do seu ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Caixa de visto para o nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Caixa de visto para indicar se o utilizador quer um nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registar nome de utilizador público</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Editar nome público de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Escolha o seu nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Entrada de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Campo de texto da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Campo de texto para confirmação da palavra-chave</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmar palavra-chave</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Botão de página anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>Botão de pressionar para aceder à página anterior do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Cancelar a criação de conta / associação</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>botão para cancelar criação de conta ou associação</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Botão de página seguinte</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Botão de pressionar para aceder à página seguinte do assistente</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Ficheiros de arquivo Jami (*.gz); Todos os ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>A sua conta tem de ser migrada. Introduza a sua palavra-chave.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>A migrar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>A importar ficheiro da conta...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>A gerar a sua conta Jami...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Erro ao criar a conta</translation>
     </message>
@@ -1515,37 +1099,32 @@ utilizador em vez do seu ID.</translation>
         <translation>Alterar a palavra-chave da conta</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Introduzir a palavra-chave atual</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Introduzir a palavra-chave nova</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Confirmar a palavra-chave nova</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Confirmar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>A palavra-chave foi alterada com sucesso</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>A palavra-chave atual está incorreta</translation>
     </message>
@@ -1566,17 +1145,17 @@ utilizador em vez do seu ID.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Mostrar foto instantânea</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1584,12 +1163,12 @@ utilizador em vez do seu ID.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Ficheiros (*)</translation>
     </message>
@@ -1597,83 +1176,30 @@ utilizador em vez do seu ID.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Cliente de e-mail padrão não encontrado</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Editar Nome do Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Desassociar Dispositivo da Conta</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Desbloquear Contacto</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Conta Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Definir o nome registado</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Tem a certeza que quer registar este nome?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Após ser associado a esta conta, não pode ser alterado.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>O seu nome registado novo será:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Confirmar registo</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>O nome foi registado com sucesso!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Algo correu mal.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Por favor tente de novo mais tarde</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>A sua conta não tem um nome registado</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1684,49 +1210,6 @@ utilizador em vez do seu ID.</translation>
         <translation>Select folder</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Alterar a imagem do seu avatar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Gravar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Tirar uma foto</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Câmara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Selecionar um ficheiro</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Abrir uma imagem</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Ficheiros de imagem (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1735,283 +1218,315 @@ utilizador em vez do seu ID.</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Áudio / vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Caixa de visto &quot;Ativar notificações&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Ativar notificações no ambiente de trabalho</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Caixa de visto &quot;Manter minimizado ao fechar&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Manter minimizado ao fechar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Pasta de descarregamentos</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Gravações</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Gravar em</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Gravar sempre</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Caixa de visto &quot;Verificar atualizações automaticamente&quot;</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Verificar se existem atualizações a cada</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Seletor do intervalo em dias entre verificação de atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Botão para verificar atualizações agora</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Verificar se existem atualizações</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Nome Registado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Palavra-chave</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Ativar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Escreva aqui para registar um nome</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Alterar palavra-chave</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exportar conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Eliminar conta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Dispositivos associados</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Associar outro dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Contactos bloqueados</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Configurações avançadas de conta </translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Microfone</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Seletor de dispositivo de entrada de áudio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Dispositivo de Saída</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Escolha o dispositivo de saída</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Seletor de dispositivo de vídeo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolução</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Seletor de resolução do dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Pré-visualização não disponível em chamadas</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Introduza o nome a ser mostrado</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Um nome registado não deve ter espaços e deve ter no mínimo 3 caracteres</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Este nome já foi escolhido por outra pessoa</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Este nome registado já foi escolhido por outra pessoa</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Este nome está disponível</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Registar este nome</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Remover dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Introduza a palavra-chave desta conta para confirmar a remoção deste dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Por favor confirme que quer remover este dispositivo</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Exportar conta aqui</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Selecionar uma pasta para os seus descarregamentos</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Selecionar uma pasta para as suas gravações</translation>
     </message>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index 2463ebc..98da51d 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Setari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Nume de utilizator</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Parola</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Parolă nouă</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Redare</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avansat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Seuritate</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Activează video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Seuritate</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Activează video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Adaugă la contacte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Șterge</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrare</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Confirmă parola</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Nume de utilizator</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Setari</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrare</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Parola</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Nume de utilizator</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index e9e52d5..4df45b8 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -10,7 +10,7 @@
     <message>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>about button</source>
-        <translation type="unfinished"/>
+        <translation>о кнопке </translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="478"/>
@@ -56,643 +56,105 @@ Jami – это приложение с распределённой архит
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Общий</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Параметры</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Имя компьютера</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Публичное зарегистрированное имя пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Имя пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Прокси</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Номер голосовой почты</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Автоответ звонков</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP разрешен</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Настройки аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Разрешать звонки от незнакомых лиц</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Разрешать звонки от лиц из списка контактов</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Разрешать звонки от лиц из истории</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Настройки основных данных аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Отображаемое имя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Ввод отображаемого имени</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>URL для SIP или инициализации DHT</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Публичное имя пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Кнопка Зарегистрировать имя пользователя блокчейн</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Зарегистрировать в блокчейн</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL-адрес службы имен</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Номер голосовой почты SIP</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Добавить аккаунт</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Строка ввода старого пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Введите старый пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Старый пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Ввод текста нового пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Введите новый пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Новый пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Ввод текста подтверждения пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Подтверждение ввода</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Подтверждение нового пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Изменить пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Кнопка отмены смены пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Изменение пароля…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Флажок Разрешить вызов из неизвестного</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Флажок Разрешить вызов из истории</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Флажок Разрешить вызов из контакта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Выбор мелодии звонка</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Кнопка воспроизведения мелодии звонка</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Проиграть</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>селектор файлов мелодий звонка</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Аудио/Видео</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Настройки параметров аудио/видео кодеков</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Аудио кодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Видео кодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Дополнительные настройки аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Регистрация</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Регистрация истекает через (секунды):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Поле счётчика таймаута регистрации</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Сетевой интерфейс</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Локальный порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Аналогично локальным параметрам</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Установить публикуемый адрес и порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>ввод текста ip-адреса</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>Использовать STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL сервера</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>Использовать TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Область </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Согласование сесcии SDP (резерв ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Данные параметры используются только во время согласования сессии SDP в случае, если ICE не поддерживается сервером или пиром.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Диапазон портов RTP для звука</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Минимум</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Максимум</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Диапазон портов RTP для видео</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Безопасность</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Настройки безопасности аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Выбор сертификата пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>ввод пароля закрытого ключа</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Селектор закрытого ключа пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Флажок шифровать поток мультимедиа (SRTP) </translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Шифрование медиапотока (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>флажок Использовать шифры по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Устройства</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Управление устройствами аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Кнопка Добавить устройство</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Добавить устройство</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Экспортировать в сеть</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Ввод текста пароля</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Пароль (обязательно)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Для добавления нового устройства к вашему аккаунту Jami, необходимо экспортировать аккаунт в сеть Jami. Для этого будет создан PIN код, который необходимо ввести на вашем новом устройстве в течение 5 минут после его генерации.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш сгенерированный PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Сгенерированный PIN для связывания</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Этот PIN должен быть введен на новом устройстве в течение 5 минут. Вы можете сгенерировать новый в любой момент.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>ОК</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Заблокированные контакты</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>вкладка Управление заблокированными контактами</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Публикуемый адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Сертификат удостоверяющего центра</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Сертификат пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Закрытый ключ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Пароль закрытого ключа</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Использовать стандартные шифры</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Добавить аккаунт</translation>
-    </message>
 </context>
 <context>
     <name>AdvancedSettingsWidget</name>
@@ -702,138 +164,142 @@ Jami – это приложение с распределённой архит
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Настройки вызовов</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Разрешить вызовы от недоверенных участников</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Автоматически принимать входящие вызовы</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Использовать свою мелодию звонка</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Добавить свою мелодию звонка</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Сервер имён</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Конфигурация OpenDHT</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Включить прокси</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Инициализация</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Пароль закрытого ключа</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Пользовательский Cертификат</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>нет пароля</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Закрытый ключ</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Сертификат удостоверяющего центра</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Связь</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>Адрес TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Использовать STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Адрес STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>Имя пользователя TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>Пароль TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>Использовать UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>Использовать TURN </translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Аудио кодеки</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Видео кодеки</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Аудиофайлы (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami – это приложение с распределённой архит
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Форма</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Список запрещенных контактов</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Заблокированный ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Разблокировать контакт и добавить в список контактов</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Показать беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Разговоры</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -908,181 +364,158 @@ Copy and share it with your friends!
 </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Показать Ring ID QR код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>кнопка Поделиться ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Двойной клик для копирования</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Ошибка при создании QR кода</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>наилучшее имя</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>наилучший ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Кнопка возврата на главную страницу</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Показать приглашения</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Приглашения</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Поиск нового или существующего контакта</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Кнопка ответа на входящий вызов </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Кнопка игнорирования входящего вызова</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Отменить исходящий вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Начать видеовызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Начать голосовой вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Очистить разговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Удалить контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Заблокировать контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Поиск по полученным приглашениям</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Свяжитесь со мной в Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Мой ID:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Сообщение от %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Звонок от %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Новый Контакт</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Введите имя…</translation>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Звонок от %1</translation>
     </message>
 </context>
 <context>
@@ -1093,46 +526,51 @@ Copy and share it with your friends!
         <translation>Удаление аккаунта</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Вы действительно хотите удалить указанный аккаунт?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Если этот аккаунт не был экспортирован или привязан к другому устройству, он будет безвозвратно потерян</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Удалить аккаунт безвозвратно</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Отменить удаление аккаунта</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Форма</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1155,78 +593,88 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Добавить новое устройство</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Чтобы добавить новое устройство, введите пароль от вашего аккаунта:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Экспорт аккаунта в сеть</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш сгенерированный PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Этот PIN с паролем аккаунта должны быть введены на новом устройстве в течение 5 минут. </translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Закрыть</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Пароль аккаунта неверен</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Что-то пошло не так, повторите попытку позднее.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -1236,6 +684,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +765,62 @@ Please try again later.</source>
         <translation>Добро пожаловать в</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Создать учётную запись Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Привязать это устройство к аккаунту</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Привязать это устройство к существующему аккаунту</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1308,49 +834,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Введите ваш PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Или импортируйте из файла:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Привязать из архивного файла аккаунта</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(нет)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Имя профиля</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1359,138 +887,195 @@ instead of using your ID.</source>
 После регистрации только вы сможете его использовать. Ваши друзья смогут связаться с вами по вашему имени вместо ID.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Зарегистрировать публичное имя</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Ввод текста пароля</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Ввод текста подтверждения пароля</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Подтверждение пароля</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Идёт создание вашего аккаунта Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>кнопка Предыдущая страница</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>нажмите кнопку для перехода к предыдущей странице Мастера</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Кнопка Следующая страница</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>Нажмите кнопку для перехода к следующей странице Мастера</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Архивы Jami (*.gz); Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Переносим ваш аккаунт Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Импорт архива с аккаунтом…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Идёт создание вашего аккаунта Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Ошибка при создании аккаунта</translation>
     </message>
@@ -1503,37 +1088,32 @@ instead of using your ID.</source>
         <translation>Изменить пароль аккаунта</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Введите текущий пароль</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Введите новый пароль</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Подтвердите новый пароль</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Подтвердить</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Пароль успешно изменён</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Текущий пароль неправилен</translation>
     </message>
@@ -1554,17 +1134,17 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1572,12 +1152,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1585,83 +1165,30 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Не найден почтовый клиент по умолчанию</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Изменить имя устройства</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Отвязать устройство от аккаунта</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Разблокировать контакт</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Аккаунт Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Установить зарегистрированное имя</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Вы уверены, что хотите зарегистрировать это имя?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>После связи с аккаунтом изменить будет нельзя</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Ваше зарегистрированное имя будет:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Подтвердить регистрацию </translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Имя было успешно зарегистрировано.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Что-то пошло не так.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Пожалуйста, повторите попытку позднее.</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Ваш аккаунт не имеет зарегистрированного имени</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1672,49 +1199,6 @@ instead of using your ID.</source>
         <translation>Выбрать папку</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Изменить изображение аватара</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Сохранить</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Сделать фото</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Камера</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Выбрать файл</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Открыть изображение</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Файлы изображений (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1723,283 +1207,315 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Аудио/Видео</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>флажок Включить уведомления</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Включить уведомления</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>флажок Сворачивать вместо закрытия</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Сворачивать вместо закрытия</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Папка для загрузок</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Сохранить в</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Всегда записывать</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Обновления</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>флажок Автоматическая проверка наличия обновлений</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Проверять обновления автоматически каждые</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Интервал проверки обновлений (дней)</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Кнопка Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Зарегистрированное Имя</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Задействовать</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Введите имя пользователя для регистрации</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Изменить пароль</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Экспортировать учетную запись</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Удалить аккаунт</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Привязанные устройства</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Привязать другое устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Заблокированные контакты</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Дополнительные настройки аккаунта</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Микрофон</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Выбор входного аудиоустройства</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Устройство вывода</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Выберите устройство вывода</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Селектор видеоустройств</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Разрешение</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Селектор разрешения видеоустройства</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Предпросмотр недоступен во время звонка</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Введите отображаемое имя</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Зарегистрированное имя пользователя не должно содержать пробелов и быть как минимум три символа длиной</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Это имя пользователя уже занято</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Зарегистрированное имя пользователя уже занято</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Имя пользователя доступно</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Зарегистрировать новое имя</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Удалить устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Введите пароль аккаунта для удаления этого устройства</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Пожалуйста, подтвердите удаление этого устройства</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Экспортировать аккаунт сюда</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Выберите папку для ваших загрузок</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Выберите папку для ваших записей</translation>
     </message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 036cb76..f0d31b7 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Основные</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Учетная запись</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Параметры</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Имя компьютера</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Имя пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Прокси</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Номер голосовой почты</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP включен</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Новый пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Изменить пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Воспроизвести</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Аудио/видео</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Аудиоодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Видеокодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Регистрация</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Время истечения регистрации в секундах:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Сетевой интерфейс</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Аналогично локальным параметрам</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Установить публичный адрес и порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Связь</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Использовать STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Область</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Согласование сесcии SDP (ICE недоступен)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Диапазон портов RTP для звука</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Мин</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Макс</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Безопасность</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Добавить устройство</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Экспортировать в сеть</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш сгенерированный PIN:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Медиа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Включить видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Публикуемый адрес</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Сертификат удостоверяющего центра</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Сертификат пользователя</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Приватный ключ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Пароль приватного ключа</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Начальная загрузка</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Пароль закрытого ключа</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Сертификат пользователя</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Связь</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Использовать STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Использовать TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Использовать TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Медиа</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Включить видео</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Скопировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Входящее сообщение от %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Входящий вызов от %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Новый контакт</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Входящий вызов от %1</translation>
     </message>
 </context>
 <context>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Экспорт аккаунта</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш сгенерированный PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>О продукте</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Зарегистрировать</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Привязать это устройство к аккаунту</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Привязать это устройство к существующему аккаунту</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Введите ваш PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Или импортируйте из файла:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Учётная запись</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Подтверждение пароля</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Учетная запись SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Имя пользователя</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Идёт создание вашего аккаунта Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Не найден почтовый клиент используемый по умолчанию</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Сохранить</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Учётная запись</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Оставлять свернутым при закрытии</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Папка для загрузок</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Сохранить в</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Профиль</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Зарегистрировать</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Учетная запись SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Имя пользователя</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Имя компьютера</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Разрешение</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 2ac22f8..e2bfb12 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Nastavenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Všeobecné</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Účet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Hostname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP zapnuté</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Spusť</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrácia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Zapnúť video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Zariadenia</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Pridaj zariadenie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Zruš</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
+        <source>STUN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
-        <source>Use STUN</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
-        <source>STUN Address</source>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Zapnúť video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Odpoveď</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Vymaž</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O programe</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Zruš</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Ďalej</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Vyber súbor</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Vyber súbor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Súbory (*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Zruš</translation>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>Všeobecné</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Zruš</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>Nastavenie</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>Účet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>Všeobecné</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Nahrávky</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Registrované meno</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Zariadenie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 0dbf2cc..f769c6c 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Splošno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Strežnik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Uporabnik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Geslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Številka glasovnega predala</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Samodejno odgovori klice</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP omogočen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Dovoli klice nepoznanih klicateljev</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Dovoli klice stika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Dovoli klice iz zgodovine</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Javno ime</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Prijava na &apos;blockchain&apos;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL imenske storitve</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Novo geslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>V redu</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Izbira zvonjenja</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Predvajaj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Avdio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Avdio kodeki</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Video kodeki</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Prijava</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Časovna omejitev prijave (sek):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Mrežni vmesnik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokalna vrata:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Isto kot lokalni parametri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Nastavi objavljen naslov in vrata:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Vrata</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Povezljivost</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Uporabi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL strežnika</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Uporabi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Območje (realm)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Dogovarjanje seje SDP (ICE Fallback)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Te nastavitve so uporabljene samo ob dogovarjanju SDP seje v primeru, da ICE protokol ni podprt s strani strežnika ali vozla.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Omočje RTP vrat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Območje vrat za video RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Varnost</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Šifriranje pretoka vsebine (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Naprave</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Dodaj napravo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Geslo (zahtevano)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Vsebine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Tvoj ustvarjen PIN:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Omogoči video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Ta PIN moraš vnesti na tvoji novi napravi v roku 5 minut. Lahko ustvariš nov PIN kadarkoli.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Video kodeki</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Zavrnjeni stiki</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Avdio kodeki</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Objavi naslov</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA Certifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Osebni certifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Zasebni ključ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Geslo zasebnega ključa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Uporabi privzete ćiperje</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Varnost</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Geslo osebnega ključa</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Povezljivost</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Uporabi STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Uporabi TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Uporabi TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Vsebine</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Omogoči video</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Avdio kodeki</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Video kodeki</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Zavrnjen ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Prekliči zavrnitev stika in dodaj med aktivne stike</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Pogovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Kopiraj z dvojnim klikom</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Napaka med pripravo QR kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Dodaj v stike</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti s tabo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Odgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Odstrani stik</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopiraj številko</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Dohodno sporočilo od %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Dohodni klic od %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
+    <message>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Nov stik</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Dohodni klic od %1</translation>
     </message>
 </context>
 <context>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Pobriši</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>ta naprava</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Obrazec</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>V redu</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Tvoj ustvarjen PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Izhod</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>O Ring</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Prijavi se</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Prekliči</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Zapri</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Napaka mreže</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>Dobrodošli v</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Poveži to napravo k računu</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Poveži to napravo k obstoječemu računu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Vnesi svoj PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Prijavi javno ime</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Izberi svoje uporabniško ime:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Potrdi geslo</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP račun</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Uporabnik</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Prejšni</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Nazaj</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Naprej</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Odpri datoteko</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Izberi datoteko</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Izberi datoteko</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Ne najdem privzetega programa za e-pošto</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Shrani</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Minimiziraj ob zaprtju</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Posnetki</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Preveri posodobitve zdaj</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>Geslo</translation>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identiteta</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Prijavljeno ime</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Prijavi se</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Zavrnjeni stiki</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP račun</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Uporabnik</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Strežnik</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Avdio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Izhodna naprava</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Naprava</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Resolucija</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Predogled ni možen med klicem</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index a1f131e..831c383 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -56,642 +56,104 @@ Jami është një software komunikimi të siguruar dhe të shpërndarë.</transl
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Rregullime</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Të përgjithshme</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Llogari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Lloj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametra</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Strehëemër</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Emër përdoruesi regjistruar publikisht</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Emër përdoruesi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Krijoni llogari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Ndërmjetës</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Numër voicemail</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Vetëpërgjigju thirrjeve</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>Me Upnp të aktivizuar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Rregullime Llogarie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Lejo Thirrje Prej të Panjohurish</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Lejo Thirrje Prej Kontaktesh</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Lejo Thirrje Prej Historiku</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Formësim të dhënash të përgjithshme llogarie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Emër i shfaqur</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>Fushë për dhënie aliasi shfaqjeje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>URL strehëemri për DHT bootstrap ose SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Emër publik përdoruesi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Buton Regjistroje emrin e përdoruesit në &lt;em&gt;blockchain&lt;/em&gt;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Regjistroje në &lt;em&gt;blockchain&lt;/em&gt;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL shërbimi emrash</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Dhënie URL për &lt;em&gt;nameservice&lt;/em&gt;</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>Dhënie emri përdoruesi SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>Dhënie fjalëkalimi SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>Dhënie URL-je ndërmjetësi SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>Numër SIP për mesazhe zanorë</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Kutizë për Vetëpërgjigju thirrjeve</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>Kutizë për Me UPnP të aktivizuar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>Rresht dhënieje fjalëkalimi të vjetër</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Dhënie fjalëkalimi të vjetër</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Fjalëkalim i Vjetër</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>Dhënie teksti fjalëkalimi të ri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Dhënie fjalëkalimi të ri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Fjalëkalim i ri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>Dhënie teksti ripohimi fjalëkalimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Dhënie ripohimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Ripohim fjalëkalimi të ri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Ndryshoni fjalëkalimin</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>Buton Anuloni ndryshim fjalëkalimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Po ndryshohet fjalëkalimi…</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Kutizë Lejo thirrje prej të panjohurish</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>Kutizë Lejo Thirrje Prej Historiku</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>Kutizë Lejo Thirrje Prej Kontaktesh</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Përzgjedhje Zileje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>Buton Luaje zilen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Luaje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Përzgjedhës kartele për zile</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Formësim parapëlqimesh kodekësh audio/video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Kodekë audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Kodekë video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Të mëtejshme</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Formësim i thelluar i llogarisë</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Regjistrim</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Kohë skadimi regjistrimi (në sekonda):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>Kutizë përzgjedhësi mbarimi kohe regjistrimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Ndërfaqe Rrjeti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Portë Lokale:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>kutizë përzgjedhësi porte lokale</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>njësoj si buton rrethor lokal</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Njësoj si parametrat vendorë</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>buton rrethor Personalizoni adresë dhe porta</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Shtoni Llogari</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Caktoni adresë dhe portë të publikuar:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adresë</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>Rregullime për Thirrjet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>dhënie teksti adrese IP</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>Vetëpërgjigjiu Thirrjeve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Portë</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>Aktivizo Zile Vetjake</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>kutizë përzgjedhësi porte</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Aftësi lidhjeje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>Kutizë për Përdor STUN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>Adresë STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Përdor STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL Shërbyesi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>kutizë për Përdor TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>Përdor UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Përdor TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Dhënie URL-je shërbyesi TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>Dhënie emri përdoruesi për shërbyes TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Dhënie fjalëkalimi për te shërbyes TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Dhënie URL-je shërbyesi TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Tratativa Sesioni SDP (ICE Fallback)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Këto rregullime përdoren vetëm gjatë tratativash sesioni SDP kur ICE nuk mbulohet nga shërbyesi ose ana tjetër e komunikimit.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Interval Porte Audio RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Kufi i poshtëm përzgjedhësi intervali porte RTP audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Maks.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>Kufi i sipërm përzgjedhësi intervali porte RTP audio</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Interval Porte RTP video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Siguri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Formësim sigurie llogarie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Përzgjedhës dëshmie autoriteti dëshmish</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>Përzgjedhës dëshmie përdoruesi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>dhënie fjalëkalimi kyçi privat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Përzgjedhës kyçi privat përdoruesi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>Kutizë Fshehtëzo rrjedhë media (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Fshehtëzim Rrjedhash Media (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>Kutizë Përdor shifra parazgjedhje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Pajisje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>Administrim pajisjesh llogarie</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Buton Shtoni pajisje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Shtoni pajisje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Eksportoje në rrjet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>Dhënie teksti fjalëkalimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Fjalëkalim (i domosdoshëm)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Buton Anulo eksportim llogarie për lidhje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Anuloje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Që t’i shtoni llogarisë tuaj Jami një pajisje të re, eksportoni llogarinë tuaj në rrjet. Kjo do të prodhojë një PIN që duhet dhënë te pajisja juaj e re brenda 5 minutash nga çasti i prodhimit.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Buton vleftësimi eksporti nën DHT për lidhje pajisjesh</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>PIN-i juaj i prodhuar:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN i prodhuar për lidhje</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Ky PIN duhet dhënë te pajisja juaj e re brenda 5 minutash. Mund të prodhoni një të ri në çfarëdo çasti.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Buton Prano prodhim PIN-i dhe dil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Kontakte të Dëbuar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Skedë administrimi kontaktesh të dëbuar</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Adresë e Publikuar</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>Dëshmi AD</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Dëshmi përdoruesi</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Aktivizo Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Kyç privat</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Kodekë Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Fjalëkalim kyçi privat</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Kodekë Audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Përdor shifër parazgjedhje</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>Kartela Audio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Shtoni Llogari</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>Shtoni një zile vetjake</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami është një software komunikimi të siguruar dhe të shpërndarë.</transl
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Rregullime për Thirrjet</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Lejo Thirrje Prej Ortakësh Jo të Besuar</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Vetëpërgjigjiu Thirrjeve</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Aktivizo Zile Vetjake</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Shtoni një zile vetjake</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Shërbyes Emrash</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adresë</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>Formësim OpenDHT-je</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Aktivizo Ndërmjetës</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Siguri</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Fjalëkalim Kyçi Privat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Dëshmi Përdoruesi</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>pa fjalëkalim</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Kyç Privat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>Dëshmi AD</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Aftësi lidhjeje</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        Adresë TURN</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Përdor STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>Adresë STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        Emër përdoruesi TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation>Përdor UPnP</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Përdor TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        Fjalëkalim TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
-        <translation>Përdor UPnP</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Përdor TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Aktivizo Video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Kodekë Audio</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Kodekë Video</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Kartela Audio (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami është një software komunikimi të siguruar dhe të shpërndarë.</transl
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Listë kontaktesh të dëbuar</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>ID e dëbuar</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Buton Hiqi dëbimin kontaktit</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Hiqini dëbimin kontaktit dhe shtojeni te lista e kontakteve</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Shfaq biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>Dhënie teksti kërkimi kontakti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,183 +363,160 @@ Kjo është ID-ja juaj.
 Kopjojeni dhe jepuani shokëve!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Shfaq kod QR ID-je Ring-u</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Buton Ndani ID Ringu Me të Tjerët</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dyklikojeni që të kopjohet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Gabim teksa prodhohej kodi QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Buton Mbrapsht te faqja hyrëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Shtoje te kontaktet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Shfaq ftesa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Ftesa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Gjeni një kontakt të ri ose ekzistues</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Dëshiron të bisedojë me ju!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Buton Përgjigjuni thirrjes ardhëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Buton Shpërfille thirrjen ardhëse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Përgjigjuni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Shpërfille</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Anuloje dërgimin e thirrjes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Filloni thirrje video</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Filloni thirrje audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Pastroje bisedën</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Hiqe kontaktin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Bllokojeni kontaktin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopjoje numrin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Kërkoni te ftesat tuaja të marra</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Lidhuni me mua në Jami</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>ID-ja ime është:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Mesazh ardhës nga %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>Thirrje ardhur nga %1</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Kontakt i Ri</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Jepni një emër…</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1092,48 +525,53 @@ Kopjojeni dhe jepuani shokëve!</translation>
         <translation>Fshirje llogarie</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Doni vërtet të fshihet llogaria vijuese?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>Nëse kjo llogari s’është eksportuar, ose shtuar te një tjetër pajisje, do të humbë në mënyrë të pakthyeshme.</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Fshije llogarinë përgjithmonë</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Fshije</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Anulo fshirje llogarie</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>këtë pajisje</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1154,59 +592,69 @@ Kopjojeni dhe jepuani shokëve!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Shtoni Një Pajisje të Re</translation>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Fjalëkalim</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Që të shtoni një pajisje të re, jepni fjalëkalim për në llogarinë tuaj:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Eksportim llogarie në rrjet</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>PIN-i juaj i prodhuar:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>Ky pin dhe fjalëkalimi i llogarisë duhen dhënë te pajisja juaj brenda 5 minutash.</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Mbylle</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Fjalëkalimi për llogarinë tuaj qe i pasaktë</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>Lidhni Një Pajisje Tjetër</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Fjalëkalim i pasaktë</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>Diç shkoi ters.
@@ -1216,17 +664,17 @@ Ju lutemi, riprovoni më vonë.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Dalje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Mbi</translation>
     </message>
@@ -1236,6 +684,69 @@ Ju lutemi, riprovoni më vonë.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>Caktoni Emër të Regjistruar</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>Dhënie teksti fjalëkalimi</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>Dhënie teksti fjalëkalimi</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Fjalëkalim</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Regjistrohuni</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Anuloje</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Mbylle</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Fjalëkalim i pasaktë</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Gabim rrjeti</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +765,62 @@ Ju lutemi, riprovoni më vonë.</translation>
         <translation>Mirë se vini te</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Logo Mirëseardhjeje</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Buton Krijoni llogari Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Buton për të shkaktuar fillimin e krijimit të llogarisë Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Krijoni një llogari Jami</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Buton Lidhni pajisje</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>Buton për të shkaktuar fillimin e lidhjes së një llogarie</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Lidheni këtë pajisje me një llogari</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Lidheni këtë pajisje me një llogari ekzistuese</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1317,49 +843,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Do të merrni PIN-in e nevojshëm për plotësimin e këtij formulari. PIN-i është i vlefshëm vetëm për &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 minuta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Jepni PIN-in tuaj:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Ose importoni një kartelë:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>Lidheni prej kartele arkivi të eksportuar llogarie</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Asnjë)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Fjalëkalim:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Emër profili</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Llogari</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1370,138 +898,195 @@ Shokët tuaj do të jenë në gjendje t’ju bëjnë thirrje me emrin tuaj të p
 në vend se të përdorin ID-në tuaj.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>Kutizë emri publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>Kutizë përzgjedhjeje nëse përdoruesi dëshiron një emër publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Regjistroni emër publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Përpunim emri publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Zgjidhni mrin tuaj të përdoruesit</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>Dhënie teksti fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>Dhënie teksti fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Fjalëkalim</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>Dhënie teksti ripohimi fjalëkalimi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Ripohoni fjalëkalimin</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Llogari SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Ndërmjetës</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>Dhënie emri përdoruesi SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Emër përdoruesi</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Po prodhohet llogaria juaj Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Buton Faqja e mëparshme</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>buton për të kaluar te faqja e mëparshme e ndihmësit</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>I mëparshmi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>Anuloni krijim/lidhje llogarie</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>shtypni butoni që të anulohet krijimi ose lidhja e llogarisë</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Mbrapsht</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Buton Faqja pasuese</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>buton për të kaluar te faqja pasuese e ndihmësit</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Pasuesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Hapni Kartelë</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Kartela arkivi Jami (*.gz); Krejt kartelat (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Lypset të migrohet llogaria juaj. Jepni fjalëkalimin tuaj.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Po migrohet llogaria juaj Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Po importohet arkiv llogarie…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Po prodhohet llogaria juaj Jami…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Gabim në krijimin e llogarisë</translation>
     </message>
@@ -1514,37 +1099,32 @@ në vend se të përdorin ID-në tuaj.</translation>
         <translation>Ndryshoni Fjalëkalim Llogarie</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Jepni Fjalëkalimin e Tanishëm</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Jepni Fjalëkalimin e Ri</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Ripohoni Fjalëkalim të Ri</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Ripohoje</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Fjalëkalimi u Ndryshua Me Sukses</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Fjalëkalim i Tanishëm i Pasaktë</translation>
     </message>
@@ -1565,17 +1145,17 @@ në vend se të përdorin ID-në tuaj.</translation>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Shfaqje kioske fotosh</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Zgjidhni Kartelë</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Kartela Figurash (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1583,12 +1163,12 @@ në vend se të përdorin ID-në tuaj.</translation>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Zgjidhni Kartelë</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Kartela (*)</translation>
     </message>
@@ -1596,83 +1176,30 @@ në vend se të përdorin ID-në tuaj.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>S’u gjet klient parazgjedhje poste</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Përpunoni Emër Pajisjeje</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Hiqini Lidhjen Prej Llogarie Kësaj Pajisjeje</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Zhbllokoje Kontaktin</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Llogari Jami</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Caktoni Emër të Regjistruar</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Jeni i sigurt se doni të regjistrohet ky emër?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>Pasi të përshoqërohet me këtë llogari, s’mund të ndryshohet.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Emri juaj i ri i regjistruar do të jetë:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Ripohoni Regjistrimin</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Anuloje</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Emri u regjistrua me sukses!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Diç shkoi ters.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Ju lutemi, riprovoni më vonë</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Llogaria juaj nuk ka ndonjë emër të regjistruar</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1683,49 +1210,6 @@ në vend se të përdorin ID-në tuaj.</translation>
         <translation>Përzgjidhni dosje</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Ndryshoni Figurën e Avatarit Tuaj</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Ruaje</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Bëni Foto</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamerë</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Përzgjidhni Kartelë</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Anuloje</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Hape Figurën</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Kartela Figurash (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1734,283 +1218,315 @@ në vend se të përdorin ID-në tuaj.</translation>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Llogari</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Të përgjithshme</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Audio / Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>Kutizë Aktivizo njoftimet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Aktivizoni njoftime nga desktopi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Kutizë Mbaje të minimizuar kur dilet</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Mbaje të minimizuar kur dilet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Dosje Shkarkimi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Incizime</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Ruaje te</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Përherë Në Regjistrim</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Përditësime</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Kutizë Kontrolle të vetvetishme për përditësime</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Kontrollo vetvetiu për përditësime çdo</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>Përzgjedhës intervali mes kontrollesh për përditësime, në ditë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>ditë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Buton Kontrollo tani për përditësime</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Kontrollo tani për përditësime</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Emër i Regjistruar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Fjalëkalim</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Aktivizoje</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identitet</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Emër i regjistruar</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Shtypni këtu që të regjistroni një emër përdoruesi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Regjistrohuni</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Ndryshoni Fjalëkalimin</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Eksportoje Llogarinë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Fshije Llogarinë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Pajisje të Lidhura</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Lidhni Një Pajisje Tjetër</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Kontakte të Bllokuara</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Kontakte të Dëbuar</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Rregullime të Mëtejshme Llogarie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Llogari SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Emër përdoruesi</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Strehëemër</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Ndërmjetës</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Përzgjedhës pajisje audio në hyrje</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Pajisje Në Dalje</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Zgjidhni pajisje output-i</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Pajisje</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Përzgjedhës pajisje video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Qartësi</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Përzgjedhës qartësie pajisje video</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>S’bëhet dot paraparje gjatë thirrjesh</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Jepni emrin e shfaqur</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Emri i regjistruar s’duhet të përmbajë hapësira dhe duhet të jetë të paktën tre shkronja i gjatë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Ky emër është zënë tashmë</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Ky emër i regjistruar është zënë tashmë</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Ky emër është i lirë</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Regjistro këtë emër</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Hiqe Pajisjen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Që të ripohoni heqjen e kësaj pajisje, jepni fjalëkalimin e kësaj llogarie</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Ju lutemi, ripohoni se doni të hiqet kjo pajisje</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Eksportoje Llogarinë Këtu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>Përzgjidhni Një Dosje Për Shkarkimet Tuaja</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Përzgjidhni Një Dosje Për Regjistrimet Tuaja</translation>
     </message>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index dcad314..5b0e51a 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Allmänt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Parametrar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Värdnamn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Användarnamn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Lösenord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Nummer till röstbrevlåda</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Besvara samtal automatiskt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP aktiverad</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Tillåt samtal från okända</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Tillåt samtal från kontakt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Tillåt samtal från historik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Offentligt användarnamn</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Registrering i blockkedjan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Namntjänst-URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Nytt lösenord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Byt lösenord</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Ringsignaler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Spela</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Ljud/Video</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Ljudkodekar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Videokodekar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Avancerat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Registrering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Tidsgräns för registrering (sekunder):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Nätverksgränssnitt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Lokal port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Samma som lokala parametrar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Ange publicerad adress och port:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adress</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>Anslutningsbarhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Använd STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Serveradress</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Använd TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Område</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP sessionsförhandling (ICE-reserv)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Dessa inställningar används endast under SDP-sessionsförhandling, om ICE inte stöds av server eller deltagare.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Audio RTP portintervall</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Max</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Video RTP portintervall</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Säkerhet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Mediaströmkryptering (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Lägg till enhet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Exportera på nätverket</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Lösenord (obligatoriskt)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Din PIN-kod:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Aktivera video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN-kod</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Denna PIN-kod skall anges på din nya enhet, inom 5 minuter. Du kan generera en kod ny när du vill.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>Videokodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Bannlysta kontakter</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>Ljudkodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Publiserad adress</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA-certificat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Användarcertifikat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Privat nyckel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Lösenord för privat nyckel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Använd standardshiffer</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Adress</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Aktivera proxy</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Säkerhet</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Privat nyckellösenord</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Användarcertifikat</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Anslutningsbarhet</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Använd STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Använd TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Använd TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Media</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Aktivera video</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Ljudkodekar</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Videokodekar</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Bannlyst ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Ta bort bannlysningen för kontakten, och lägg till i kontaktlistan</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Konversationer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklicka för att kopiera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Ett fel inträffade vid generering av QR-kod</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Lägg till i kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Vill prata med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>Rensa konversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Ta bort kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Blockera kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Kopiera nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Inkommande meddelande från %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
-        <source>%1</source>
-        <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Inkommande samtal från %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <location filename="../callwidget.cpp" line="847"/>
+        <source>%1</source>
+        <comment>%1 is the contact username</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Ange ett namn...</translation>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Inkommande samtal från %1</translation>
     </message>
 </context>
 <context>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>denna enhet</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulär</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Lösenord</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Exporterar konto</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Din PIN-kod:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN-kod</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>Felaktigt lösenord</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Lösenord</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Registrera</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>Felaktigt lösenord</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Nätverksfel</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>Välkommen till</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Skapa ett Jami-konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Koppla denna enhet till ett konto</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Koppla den här enheten till ett befintligt konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Ange din PIN-kod:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Eller importera en fil:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Registrera offentligt användarnamn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Välj användarnamn</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Bekräfta lösenord</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP-konto</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Användarnamn</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Genererar ditt Jami-konto...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Tillbaka</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Ditt konto måste migreras. Ange ditt lösenord.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Fel vid kontoskapande</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Ingen ordinarie e-postklient hittades</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami-konto</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Spara</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Minimera istället för att avsluta</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>Nerladdningsmapp</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Inspelningar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Spara i</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Sök efter uppdateringar nu</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Registrerat namn</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Aktivera</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Identitet</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Registrerat namn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Registrera</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Exportera konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Ta bort konto</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Bannlysta kontakter</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP-konto</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Användarnamn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Värdnamn</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Utdataenhet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Upplösning</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Förhandsvisa otillgängliga under samtal</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index 97eb024..8acaede 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -56,643 +56,105 @@ Jami güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Ayarlar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Genel</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Hesap</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Tür</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Değişkenler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Sunucu adı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>Kamusal kayıtlı kullanıcı adı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Kullanıcı adı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Parola</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Vekil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Sesli ileti numarası</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Aramaları kendiliğinden yanıtla</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP etkin</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>Hesap Ayarları</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Bilinmeyenden Aramaya İzin Ver</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Kişilerden Aramaya İzin Ver</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Geçmişten Aramaya İzin Ver</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>Genel hesap bilgileri yapılandırması</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>Görüntülenen ad</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Herkese açık kullanıcı adı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Kullanıcı adını blok zincir düğmesine kaydet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Blok zincire kaydet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>Ad hizmeti adresi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP kullanıcı adı girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP parola girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP vekil alan adı girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP sesli posta numarası</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>Eski parolayı girin</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>Eski Parola</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>Yeni parolayı girin</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Yeni parola</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>Giriş onayı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>Yeni parola doğrulama</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Parolayı değiştir</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Tamam</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>Parola değiştirme ...</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Zil Sesi Seçimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Oynat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>Zil sesi dosyası seçici</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Ses/Görüntü</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Ses/görüntü çözücü tercihlerini yapılandırma</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Ses çözücüleri</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Görüntü çözücüler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Gelişmiş</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>Gelişmiş hesap yapılandırma</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Kaydolma</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Kaydolma bitimi zaman aşımı (saniye):</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>Hesap Ekle</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Ağ Arayüzü</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Yerel Delik:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Yerel değişkenlerle aynı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Yayımlanan yeri ve deliği belirle:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Delik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>STUN onay kutucuğunu kullan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>STUN kullan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>Sunucu adresi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>TURN onay kutucuğunu kullan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1716"/>
-        <source>Use TURN</source>
-        <translation>TURN kullan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>TURN sunucusu alan adı girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>TURN sunucusu kullanıcı adı girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>TURN sunucusu parola girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>TURN sunucusu Yeki alanı girişi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Yetki alanı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP Görüşme Oturumu (ICE Geri çekilme)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Bu ayarlar yalnızca SDP oturum müzakeresi sırasında ICE&apos;nin sunucu ya da eş tarafından desteklenmemesi durumunda kullanılacaktır.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>RTP Ses Port Aralığı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Asgari</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Azami</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Görüntü RTP Delik Aralığı</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Güvenlik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Hesap güvenliği yapılandırması</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
+        <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Ortam Akışı Şifreleme (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Aygıtlar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Aygıt düğmesi ekle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Aygıt ekle</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>Ağda dışa aktar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Parola (gerekli)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>İptal</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Oluşturulan pin&apos;iniz:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>Bağlantı için oluşturulan PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Bu anahtar 5 dakika içerisinde aygıtınıza girilmiş olmalı. İstediğiniz an yenisini oluşturabilirsiniz.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>TAMAM</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Engellenmiş Kişiler</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Yayımlanan Yer</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA sertifikası</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Kullanıcı sertifikası</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Özel anahtar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Özel anahtar parolası</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Öntanımlı şifrelemeyi kullan</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>Hesap Ekle</translation>
-    </message>
 </context>
 <context>
     <name>AdvancedSettingsWidget</name>
@@ -702,138 +164,142 @@ Jami güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>Arama Ayarları</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>Güvenilmeyen Eşlerden Gelen Aramalara İzin Ver</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Aramaları otomatik yanıtla</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>Özel zil sesini etkinleştir</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>Özel bir zil sesi ekle</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>Ad Sunucusu</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Yer</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT Yapılandırması</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>Vekil sunucuyu etkinleştir</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Önyükleme</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Güvenlik</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Özel Anahtar Parolası</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Kullanıcı Sertifikası</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>parola yok</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>Özel Anahtar</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA sertifikası</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>Bağlanabilirlik</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        TURN Adresi</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>STUN kullan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN Adresi</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        TURN Kullanıcı adı</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        TURN Parolası</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>UpnP kullan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>TURN kullan</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>Ses çözücüleri</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>Görüntü çözücüler</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>Ses Dosyaları (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Yasaklı kişiler listesi</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Engellenen Kimlik</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>Kişiyi engellemeyi kaldıma düğmesi</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Kişinin engelini kaldır, kişi listesine ekle</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>Konuşmaları göster</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Konuşmalar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami, kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -907,181 +363,158 @@ Copy and share it with your friends!
 Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>Ring kimliği QR kodunu göster</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>Ring kimliği düğmesini paylaş</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Kopyalamak için çift tıkla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>QR Kodu oluşturulurken hata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>en iyi ad</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>en iyi kimlik</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>Anasayfaya dön düğmesi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Kişilere ekle</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>Davetleri göster</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>Davetler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>Yeni veya mevcut bir kişiyi bulun</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Sizinle konuşmak istiyor!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>Gelen aramayı yanıtla düğmesi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Gelen arama düğmesini yoksay</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Yanıtla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Göz ardı et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>Giden aramayı iptal et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>Görüntülü arama başlat</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>Sesli arama başlat</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Kişiyi kaldır</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Kişiyi engelle</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Numarayı kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>Aldığınız davetiyeleri arayın</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Jami&apos;de bana ulaşın</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>Kimliğim :</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>%1&apos;den gelen ileti</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>%1$s&apos;dan gelen arama</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Karşılıklı konuşma</translation>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Yeni Kişi</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>Bir ad girin...</translation>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>%1$s&apos;dan gelen arama</translation>
     </message>
 </context>
 <context>
@@ -1092,46 +525,51 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
         <translation>Hesap silme</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>Aşağıdaki hesabı gerçekten silmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>Hesabı kalıcı olarak sil</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>Hesap silmeyi iptal et</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1154,79 +592,88 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>Yeni bir Aygıt Ekle</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>Yeni bir aygıt eklemek için hesap parolasını girin:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>İptal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>Ağda hesabı dışa aktar</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Oluşturulan pin&apos;iniz:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
-        <translation>Kapat</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>Hesabınızın parolası yanlış</translation>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
-        <translation>Bir şeyler yanlış gitt.
-Lütfen daha sonra yeniden deneyin.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Çıkış</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
@@ -1236,6 +683,69 @@ Lütfen daha sonra yeniden deneyin.</translation>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1254,47 +764,62 @@ Lütfen daha sonra yeniden deneyin.</translation>
         <translation>Hoş Geldiniz</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>Hoşgeldin Logosu</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Jami hesabı düğmesi oluştur</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Bir Jami hesabı oluştur</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>Aygıt bağla düğmesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Bu aygıtı bir hesaba bağla</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Bu aygıtı var olan bir hesaba bağla</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1308,49 +833,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Pin&apos;inizi girin:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>veya bir dosya içe aktar</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(Hiçbiri)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Parola:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>Profil adı</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Hesap</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1358,138 +885,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Halka açık kullanıcı adı kaydet</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>Herkese açık kullanıcı adı düzenleme</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Kullanıcı adınızı seçin</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Parolayı onayla</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Jami hesabınız oluşturuluyor...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>Önceki sayfa düğmesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Önceki</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Geri</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>Sonraki sayfa düğmesi</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>İleri</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Dosyayı Aç</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami arşiv dosyaları (*.gz); Tüm Dosyalar (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>Hesabınızın taşınması gerekiyor. Parolanızı girin.</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Jami hesabınız göç ettiriliyor...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>Hesap arşivi içe aktarılıyor...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Jami hesabınız oluşturuluyor...</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>Hesap oluşturma hatası</translation>
     </message>
@@ -1502,37 +1086,32 @@ instead of using your ID.</source>
         <translation>Hesap Parolasını Değiştir</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>Şimdiki Parolayı Girin</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>Yeni Parolayı Girin</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>Yeni Parolayı Doğrulayın</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>Onayla</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>Parola Başarıyla Değiştirildi</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>Kullanılan Parola Hatalı</translation>
     </message>
@@ -1553,17 +1132,17 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Fotoğraf kabini görüntüsü</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>Resim Dosyaları (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1571,12 +1150,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Dosyalar (*)</translation>
     </message>
@@ -1584,83 +1163,30 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Varsayılan posta istemcisi bulunmadı</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>Aygıt Adını Düzenle</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>Aygıtın Hesaptan Bağlantısını Kaldır</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>Kişinin Engelini Kaldır</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami hesabı </translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>Kayıtlı Adı Ayarla</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>Bu adı kaydetmek istediğinizden emin misiniz?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>Yeni kayıtlı adınız şu olabilir:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>Kaydı Onayla</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>İptal</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>Ad başarıyla kaydedildi!</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>Bazı şeyler yanlış gitti.</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>Lütfen daha sonra yeniden deneyin</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>Hesabınızda kayıtlı bir ad yok</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1671,49 +1197,6 @@ instead of using your ID.</source>
         <translation>Klasör seç</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>Avatar Resminizi Değiştirin</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Kaydet</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>Fotoğraf Çek</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Kamera</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>Bir Dosya Seç</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>İptal</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>Görseli Aç</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>Resim Dosyaları (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1722,283 +1205,315 @@ instead of using your ID.</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Hesap</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>Ses / Görüntü</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Düzen</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>bildirimleri etkinleştirme kutucuğu</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>Masaüstü bildirimlerini etkinleştir</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Kapatırken küçültülmüş olarak tut</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>İndirme klasörü</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Kayıtlar</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>Devamlı kaydediliyor</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>Güncellemeler</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>Güncellemeleri kendiliğinden denetle</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>gün</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>Şimdi güncellemeleri denetle düğmesi</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>Şimdi güncellemeleri denetle</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Kayıtlı Ad</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>Kimlik</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Etkin</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>Bir kullanıcı adı kaydetmek için buraya yazın</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>Parolayı Değiştir</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Hesabı Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>Hesabı Sil</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>Bağlı Aygıtlar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>Diğer aygıtı bağla</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>Engellenmiş kişiler</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>Gelişmiş Hesap ayarları</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>Mikrofon</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>Ses giriş aygıtı seçici</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Çıkış Aygıtı</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>Çıkış aygıtını seç</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Görüntü</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Aygıt</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>Görüntü aygıtı seçici</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Çözünürlük</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>Görüntü aygıtı çözünürlük seçici</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Arama sırasında önizleme mevcut değil</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>Görünecek adı girin</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>Kayıtlı bir isim hiç boşluk bırakmamalı ve en az üç harf uzunluğunda olmalıdır.</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>Bu ad önceden alınmış</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>Bu kayıtlı ad önceden alınmış</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>Bu ad kullanılabilir</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>Bu adı kaydet</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>Aygıtı Kaldır</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>Bu aygıtın kaldırılmasını onaylamak için bu hesabın şifresini girin.</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>Lütfen bu aygıtı kaldırma isteğinizi onaylayın</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>Hesabı Buraya Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>İndirmeleriniz İçin Bir Klasör Seçin</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>Kayıtlarınız İçin Bir Klasör Seçin</translation>
     </message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index c1d669d..718f66d 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -56,641 +56,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>Налаштування</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>Головні</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>Аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>Параметри</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>Ім&apos;я хоста</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>Ім’я</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>Проксі</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>Номер голосової пошти</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>Приймати дзвінки автоматично</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP включено</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>Приймати дзвінки від невідомих контактів</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>Приймати дзвінки від контактів</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>Приймати дзвінки від контактів з історії</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>Публічне ім&apos;я користувача</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>Кнопка реєстрації імені користувача в блокчейні</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>Зареєструватися в блокчейні</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>URL сервісу імен</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>Введення URL сервісу імен</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>Прапорець автоматичного прийняття дзвінків</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>Новий пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>Змінити пароль</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>Ок</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>Поле для встановлення прапорця дозволу дзвінків від незнайомців</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>Вибір рингтону</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>Програти</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>вибір файлу звукового сигналу дзвіка</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>Аудіо/Відео</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>Налаштування аудіо та відео кодеків</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>Аудіо кодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>Відео кодеки</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>Додаткові</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>Реєстрація</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>Час придатності регістрації (секунди):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>Мережевий інтерфейс</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>Локальний порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>прокручуване колесо вибору локального порту</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>Аналогічно локальним налашуванням</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>Встановити оголошену адресу та порт:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>Адреса</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>Приймати дзвінки автоматично</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>З&apos;єднання</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>Використовувати STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>URL серверу</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>поле для встанолвлення прапорця використання TURN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>Використовувати TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>Введення URL серверу TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>Введення паролю сервера TURN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>Введення простору TURN серверу</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>Оточення</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Погодження сесій SDP (резервування ICE)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Ці налаштування використовуються лише протягом SDP  сессії у випадку коли сервер чи клієнт не підтримують ICE.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>Порти для передачі аудіо по RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>Мінімально</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>Нижня межа проміжку можливих номерів порту для передачі аудіо по протоколу RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>Максимально</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>Порти для передачі відео по RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>Безпека</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>Налаштування безпеки облікового запису</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>Вибір сертифіката центру сертифікації</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>введення приватного ключа</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>Введення приватного ключа користувача</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>Шифрування медіа потоку (SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>поле для встановлення прапорця використання шифрів за замовчуванням</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>Медіа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>Пристрої</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>Увімкнути відео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>Кнопка додавання пристрою</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>Додати пристрій</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>Пароль (вимагається)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>Кнопка скасування вивантаження облікового запису</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Щоб додати новий пристрій до вашого облікового запису Джамі, вам потрібно вивантажити ваш обліковий запис у мережу. При цьому буде створено PIN-код, який вам потрібно ввести на вашому іншому пристрої протягом 5 хвилин після створення.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>Кнопка перевірки вивантаження в DHT для прив&apos;язування пристрою</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш новий PIN-код:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>PIN-код, створений для прив&apos;язування</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN-код</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>Цей PIN-код слід ввести на вашому пристрої протягом 5 хвилин. Ви можете згенерувати новий будь-якої миті.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>Кнопка прийняття створення PIN-коду та виходу</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>Заблоковані контакти</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>Вкладка управління забороненими контактами облікового запису</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>Опублікована адреса</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA сертифікат</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>Сертифікат користувача</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>Приватний ключ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>Пароль від приватного ключа</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>Використовувати шифрувальники за замовчуванням</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -702,138 +164,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>Приймати дзвінки автоматично</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Початкове завантаження</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>Безпека</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>Пароль від приватного ключа</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>Сертифікат користувача</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>З&apos;єднання</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>Використовувати STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>Використовувати TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>Використовувати TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>Медіа</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>Увімкнути відео</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -847,57 +313,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>Список заборонених контактів</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>Заблоковані ідентифікатори</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>Розблокувати контакт і додати до списку контактів</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>Групові чати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Джамі — це вільне програмне забезпечення для будь-якого зв&apos;язку з повагою до свобод і приватності користувачів.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -905,181 +361,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>Клацніть двічі, щоб скопіювати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>Помилка при генерації QR-коду</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>Додати контакти</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>Хоче поговорити з вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>Кнопка ігнорування вхідного дзвінка</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>Відповідь</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>Видалити контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>Заблокувати контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>Копіювати номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>Зв&apos;яжіться зі мною в Джамі</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>Вхідне повідомлення від %1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>Вхідний виклик від %1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Діалог</translation>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>Новий контакт</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>Вхідний виклик від %1</translation>
     </message>
 </context>
 <context>
@@ -1090,48 +523,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>Видалити</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>цей пристрій</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1152,59 +590,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Діалог</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>Експортувати акаунт</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>Ваш новий PIN-код:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN-код</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1213,17 +661,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>Вийти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>Про программу</translation>
     </message>
@@ -1233,6 +681,69 @@ Please try again later.</source>
         <translation>Джамі</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>Зареєструватися</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>Відміна</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>Збій мережі</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1251,47 +762,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>Кнопка створення облікового запису Джамі</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Натисніть кнопку, щоб розпочати створення облікового запису Джамі</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>Створити обліковий запис Джамі</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>Прив&apos;язати цей пристрій до облікового запису</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>Зв&apos;язати цей пристрій з наявним обліковим записом</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1314,49 +840,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;Ви отримаєте PIN-код, який потрібно ввести тут. PIN-код дійсний лише протягом &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 хвилин&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>Введіть ваш PIN-код:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>Або завантажте з файлу:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>Профіль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1364,138 +892,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>Зареєструвати публічне ум&apos;я користувача</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>Оберіть ваше ім&apos;я користувача</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>Підтвердити пароль</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>Аккаунт SIP</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>Проксі</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>Ім’я</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>Створення вашого облікового запису Джамі…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>Попереднє</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>Далі</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>Відкрити файл</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Файли архівів Джамі (*.gz); Усі файли (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>Переведення вашого облікового запису Джамі…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>Створення вашого облікового запису Джамі…</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1508,37 +1093,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,17 +1139,17 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>Показ віконця світлини</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1577,12 +1157,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
@@ -1590,82 +1170,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>Не знайдено жодного поштового клієнту</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Обліковий запис Джамі</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1677,49 +1204,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>Зберігти</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>Камера</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1728,283 +1212,315 @@ instead of using your ID.</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>Головні</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>Згортати вікно при закриванні</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>Зберігти в</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>Зареєстроване ім&apos;я</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>Ідентифікатор</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>Увімкнути</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>Профіль</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>Особа</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>Зареєстроване ім&apos;я</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>Зареєструватися</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>Вивантажити обліковий запис</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>Заблоковані контакти</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>Аккаунт SIP</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>Ім’я</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>Ім&apos;я хоста</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>Проксі</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>Пристрій Виведення</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>Відео</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>Пристрій</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>Роздільна здатність</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>Попередній перегляд не доступний від час виклику</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index 01f981f..abdf21e 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>通用</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>型</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>參數</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>主機名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>使用者名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>密码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>代理</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>語音留言號</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>來電自動應答</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP 已啟動</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>允許未知來電</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>允許通訊錄來電</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>允許歷史來電</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>確定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>播放</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>音訊/視訊</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>音訊編碼器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>視訊編碼器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>進階</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>註冊</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>網路介面</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>與本地參數相同</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>設定公開地址與連結埠:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>埠</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
-        <translation>使用STUN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
-        <translation>使用</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>最小值</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>最大值</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>安全</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>媒體串流加密(SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>公開發佈地址</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA 認證</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>使用者認證</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>私鑰</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>私鑰保護密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>使用預設加密方式</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>引導</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>使用者認證</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>使用TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>使用TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -841,62 +307,52 @@ Jami is a secured and distributed communication software.</source>
     <name>AnimatedOverlay</name>
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
-        <source>Form</source>
-        <translation>從</translation>
-    </message>
-</context>
-<context>
-    <name>BannedContactsWidget</name>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>從</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation type="unfinished"/>
+        <source>Form</source>
+        <translation>從</translation>
     </message>
+</context>
+<context>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
+        <location filename="../banneditemwidget.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,183 +360,160 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>想要與你談天!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>接通</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation> </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>新連絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1089,46 +522,51 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>從</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>從</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>個人檔案</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>選擇你的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>檔案(*)</translation>
     </message>
@@ -1580,421 +1160,357 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>RingButton</name>
     <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
     <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>從</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="141"/>
+        <source>Settings</source>
+        <translation>設定</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="229"/>
+        <source>Account</source>
+        <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
+        <source>General</source>
+        <translation>通用</translation>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
+        <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
+        <location filename="../settingswidget.ui" line="542"/>
+        <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../settingswidget.ui" line="610"/>
+        <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../settingswidget.ui" line="653"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>RingButton</name>
     <message>
-        <location filename="../ringbutton.ui" line="140"/>
-        <source>Select folder</source>
+        <location filename="../settingswidget.ui" line="678"/>
+        <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetAvatarDialog</name>
     <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
+        <location filename="../settingswidget.ui" line="811"/>
+        <source>Save in</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>儲存</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
+        <location filename="../settingswidget.ui" line="904"/>
+        <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>相機</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
+        <location filename="../settingswidget.ui" line="943"/>
+        <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
+        <location filename="../settingswidget.ui" line="1008"/>
+        <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
+        <location filename="../settingswidget.ui" line="1032"/>
+        <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
-    <message>
-        <location filename="../settingswidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>從</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="147"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
-        <source>Account</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="298"/>
-        <source>General</source>
-        <translation>通用</translation>
+        <location filename="../settingswidget.ui" line="1038"/>
+        <source> days</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
-        <source>Audio / Video</source>
+        <location filename="../settingswidget.ui" line="1081"/>
+        <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
-        <source>System</source>
+        <location filename="../settingswidget.ui" line="1084"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>密码</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="566"/>
-        <source>Enable desktop notifications</source>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="594"/>
-        <source>Keep minimized on close</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
-        <source>Download folder</source>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="754"/>
-        <source>Save in</source>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
-        <source>Always Recording</source>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
-        <source>Updates</source>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="903"/>
-        <source>Check for updates automatically every</source>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
-        <source>Interval between update checks in days selector</source>
+        <location filename="../settingswidget.ui" line="1721"/>
+        <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
-        <source> days</source>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
-        <source>Check for updates now button</source>
+        <location filename="../settingswidget.ui" line="1827"/>
+        <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
-        <source>Check for updates now</source>
+        <location filename="../settingswidget.ui" line="1868"/>
+        <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
+        <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
+        <location filename="../settingswidget.ui" line="1973"/>
+        <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>密码</translation>
+        <location filename="../settingswidget.ui" line="2078"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
-        <source>Type here to register a username</source>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
-        <source>Change Password</source>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
-        <source>Export Account</source>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
-        <source>Delete Account</source>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
+        <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
-        <source>Linked Devices</source>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
-        <source>Link Another Device</source>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
-        <source>Advanced Account Settings</source>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>語音</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>影像</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>解析度</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index 5957179..aa87fb5 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -55,641 +55,103 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>设置</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>通用</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>帐户</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>类别</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>参数</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>主机名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>用户名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>密码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>代理</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>语音信箱号码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>自动应答</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP已启用</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>允许未知来电</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>允许通讯录来电</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>允许历史记录再次来电</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>公共用户名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>在区块链上注册</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>名称服务器URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>新密码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>确定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>铃声选择</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>播放</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>音频/视频</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>音频编码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>视频编码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>高级</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>注册</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>注册超时(秒):</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>网络接口</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>本地端口:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>表单</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>与本地配置相同</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>设置公开地址与端口:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>地址:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>端口</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>服务器URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>使用TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>域</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP协议握手(当ICE协议不受支持)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>该设置仅用于SDP握手,仅当服务器或客户端不支持ICE时生效。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>音频RTP端口范围</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>最小</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>最大</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>视频RTP端口范围</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>安全</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>流媒体加密(SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>设备</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>添加设备</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>密码(必填)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>媒体</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>您的PIN:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>启用视频</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>该PIN需要在5分钟内输入您的新设备。您可以随时生成新的PIN。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>确定</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>视频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>已屏蔽的联系人</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>音频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>公开地址</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>颁发机构证书</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>用户证书</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>私钥</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>私钥密码</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>使用默认加密算法</translation>
-    </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
-    <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -701,138 +163,142 @@ Jami is a secured and distributed communication software.</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>地址:</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>初始服务器</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>私钥密码</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>用户证书</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
+        <source>Use UPnP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
+        <source>Use TURN</source>
+        <translation>使用TURN</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
-        <source>Use UPnP</source>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
-        <source>Use TURN</source>
-        <translation>使用TURN</translation>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>媒体</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>启用视频</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>音频编码</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>视频编码</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation type="unfinished"/>
     </message>
@@ -846,57 +312,47 @@ Jami is a secured and distributed communication software.</source>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>已屏蔽的ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>从屏蔽列表中移除,并添加至通讯录</translation>
-    </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>会话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami是一种自由通信软件,它尊重用户的自由和隐私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -904,181 +360,158 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>双击复制</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>创建二维码时产生错误</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>想要与您通信!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>应答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>删除联系人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>屏蔽联系人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>消息来自%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="853"/>
-        <source>%1</source>
-        <comment>%1 is the contact unique identifier</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="676"/>
-        <source>Call incoming from %1</source>
-        <translation>来电:%1</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>对话框</translation>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>新通讯录</translation>
+        <location filename="../callwidget.cpp" line="852"/>
+        <source>%1</source>
+        <comment>%1 is the contact unique identifier</comment>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="675"/>
+        <source>Call incoming from %1</source>
+        <translation>来电:%1</translation>
     </message>
 </context>
 <context>
@@ -1089,48 +522,53 @@ Copy and share it with your friends!
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>该设备</translation>
+    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1151,59 +589,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>表单</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>对话框</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation type="unfinished"/>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>密码</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>您的PIN:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation type="unfinished"/>
@@ -1212,17 +660,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
@@ -1232,6 +680,69 @@ Please try again later.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>注册</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>网络错误</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1250,47 +761,62 @@ Please try again later.</source>
         <translation>欢迎来到</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>创建一个Jami账户</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>将此设备与一个帐户进行连接</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>将此设备与已有帐户进行连接</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1304,49 +830,51 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>输入您的PIN:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>密码:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>帐户资料</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1354,138 +882,195 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>注册公共用户名</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>设置您的用户名</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>确认密码</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP帐户</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>代理</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>用户名</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>您的Ring帐户可以被更新。\n请输入您的密码。</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>创建帐户时发生错误</translation>
     </message>
@@ -1498,37 +1083,32 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation type="unfinished"/>
     </message>
@@ -1549,17 +1129,17 @@ instead of using your ID.</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>选择文件</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,12 +1147,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>选择文件</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>文件 (*)</translation>
     </message>
@@ -1580,82 +1160,29 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>未找到默认邮件客户端</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami账户</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1667,49 +1194,6 @@ instead of using your ID.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>保存</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>摄像头</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1718,283 +1202,315 @@ instead of using your ID.</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>系统</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>退出时保持窗口最小化</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>录音</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>保存至</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>立即检查更新</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>已注册名称</translation>
+        <location filename="../settingswidget.ui" line="3027"/>
+        <source>Password</source>
+        <translation>密码</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
+        <source>Enable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1633"/>
-        <source>Password</source>
-        <translation>密码</translation>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
-        <source>Enable</source>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>帐户资料</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>身份</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>已注册名称</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>注册</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>已屏蔽的联系人</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP帐户</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>用户名</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>主机名</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>代理</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>输出设备</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>设备</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>分辨率</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>通话时无法预览</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index 475727a..c0a00a4 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -56,642 +56,104 @@ Jami 是一個安全且分散式的通訊軟體。</translation>
     </message>
 </context>
 <context>
-    <name>AccountDetails</name>
-    <message>
-        <location filename="../accountdetails.ui" line="23"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="66"/>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="143"/>
-        <source>Account</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="206"/>
-        <source>Type</source>
-        <translation>類型</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="250"/>
-        <source>Parameters</source>
-        <translation>參數</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="280"/>
-        <source>Hostname</source>
-        <translation>主機名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Public registered username</source>
-        <translation>公開註冊使用者名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="426"/>
-        <location filename="../accountdetails.ui" line="1754"/>
-        <source>Username</source>
-        <translation>使用者名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="469"/>
-        <location filename="../accountdetails.ui" line="1776"/>
-        <source>Password</source>
-        <translation>密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="515"/>
-        <source>Proxy</source>
-        <translation>代理服務器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="558"/>
-        <source>Voicemail number</source>
-        <translation>語音郵件號碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="598"/>
-        <source>Auto-answer calls</source>
-        <translation>自動回答呼叫</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="619"/>
-        <source>UPnP enabled</source>
-        <translation>UPnP 已啟用</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Account Settings</source>
-        <translation>帳號設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="862"/>
-        <source>Allow Call From Unknown</source>
-        <translation>允許從未知對象的通話</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="895"/>
-        <source>Allow Call From Contact</source>
-        <translation>允許從聯絡人來的通話</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="880"/>
-        <source>Allow Call From History</source>
-        <translation>允許從歷史紀錄而來的通話</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="69"/>
-        <source>General account info configuration</source>
-        <translation>一般帳號資訊設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="169"/>
-        <source>Displayed name</source>
-        <translation>顯示名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="191"/>
-        <source>Displayed alias input</source>
-        <translation>顯示別稱輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="302"/>
-        <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation>DHT bootstrap 或 SIP 的主機名稱 URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="323"/>
-        <source>Public username</source>
-        <translation>公開的使用者名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="369"/>
-        <source>Register username on blockchain button</source>
-        <translation>在區塊鏈按鈕上註冊使用者名稱</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="372"/>
-        <source>Register on blockchain</source>
-        <translation>在區塊鏈上註冊</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="389"/>
-        <source>Name service URL</source>
-        <translation>名稱服務 URL</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="411"/>
-        <source>Nameservice URL input</source>
-        <translation>名稱服務 URL 輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="448"/>
-        <source>SIP username input</source>
-        <translation>SIP 使用者名稱輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="491"/>
-        <source>SIP password input</source>
-        <translation>SIP 密碼輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="537"/>
-        <source>SIP proxy URL input</source>
-        <translation>SIP 代理伺服器 URL 輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="580"/>
-        <source>SIP voicemail number</source>
-        <translation>SIP 語音郵件數</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="592"/>
-        <source>Autoanswer call checkbox</source>
-        <translation>通話自動答覆勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="613"/>
-        <source>UPnP enabled checkbox</source>
-        <translation>UPnP 啟用勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="632"/>
-        <source>Old password input line</source>
-        <translation>舊密碼輸入行</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="641"/>
-        <source>Input old password</source>
-        <translation>輸入舊密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="656"/>
-        <source>Old Password</source>
-        <translation>舊密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="669"/>
-        <source>New password text input</source>
-        <translation>新密碼文字輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="675"/>
-        <source>Input new password</source>
-        <translation>輸入新密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="692"/>
-        <source>New password</source>
-        <translation>新密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="705"/>
-        <source>Password confirmation text input</source>
-        <translation>確認密碼文字輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="711"/>
-        <source>Input confirmation </source>
-        <translation>確認輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="727"/>
-        <source>New pass confirmation</source>
-        <translation>新密碼確認</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="751"/>
-        <source>Change password</source>
-        <translation>變更密碼</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="770"/>
-        <source>Ok</source>
-        <translation>確定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="783"/>
-        <source>Cancel password change button</source>
-        <translation>取消變更密碼按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="798"/>
-        <source>Changing password ...</source>
-        <translation>正在變更密碼……</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="856"/>
-        <source>Allow call from unknown checkbox</source>
-        <translation>允許未知通話勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="874"/>
-        <source>Allow Call From History checkbox</source>
-        <translation>允許歷史通話勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="892"/>
-        <source>Allow Call From Contact checkbox</source>
-        <translation>允許從聯絡人而來的通話勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="931"/>
-        <source>Ringtone Selection</source>
-        <translation>鈴聲選取</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="955"/>
-        <source>Play ringtone button</source>
-        <translation>播放鈴聲按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="958"/>
-        <source>Play</source>
-        <translation>播放</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="971"/>
-        <source>ringtone file selector</source>
-        <translation>鈴聲檔案選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1021"/>
-        <source>Audio/Video</source>
-        <translation>音訊/視訊</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1024"/>
-        <source>Audio/video codecs preferences configuration</source>
-        <translation>音訊/視訊編解碼器偏好設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1240"/>
-        <source>Audio codecs</source>
-        <translation>音訊編解碼器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1270"/>
-        <source>Video codecs</source>
-        <translation>視訊編解碼器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1287"/>
-        <source>Advanced</source>
-        <translation>進階</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1290"/>
-        <source>Account advanced configuration</source>
-        <translation>帳號進階設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1336"/>
-        <source>Registration</source>
-        <translation>註冊</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1356"/>
-        <source>Registration expire timeout (seconds):</source>
-        <translation>註冊過期逾時(秒):</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1372"/>
-        <source>Registration timeout selector spinbox</source>
-        <translation>註冊逾時選擇器選擇框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1397"/>
-        <source>Network Interface</source>
-        <translation>網路介面</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1418"/>
-        <source>Local Port:</source>
-        <translation>本機連接埠:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1436"/>
-        <source>local port selector spinbox</source>
-        <translation>本機埠選擇器框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1522"/>
-        <source>same as local radio button</source>
-        <translation>與本機相同單選按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1528"/>
-        <source>Same as local parameters</source>
-        <translation>與本機參數相同</translation>
-    </message>
+    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountdetails.ui" line="1546"/>
-        <source>personalise address and ports radio button</source>
-        <translation>個人化地址與連接埠單選按鈕</translation>
+        <location filename="../accountitemdelegate.cpp" line="91"/>
+        <source>Add Account</source>
+        <translation>新增帳號</translation>
     </message>
+</context>
+<context>
+    <name>AdvancedSIPSettingsWidget</name>
     <message>
-        <location filename="../accountdetails.ui" line="1552"/>
-        <source>Set published address and port:</source>
-        <translation>設定公開位置與連接埠:</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>表單</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1578"/>
-        <source>Address</source>
-        <translation>地址</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="55"/>
+        <source>Call Settings</source>
+        <translation>通話設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1597"/>
-        <source>ip address text input</source>
-        <translation>IP 位置文字輸入</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="102"/>
+        <source>Auto Answer Calls</source>
+        <translation>自動回應通話</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1612"/>
-        <source>Port</source>
-        <translation>連接埠</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="130"/>
+        <source>Enable Custom Ringtone</source>
+        <translation>啟用自訂鈴聲</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1631"/>
-        <source>port selector spinbox</source>
-        <translation>連接埠選擇器框</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="191"/>
+        <source>Connectivity</source>
+        <translation>連線</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <source>use STUN checkbox</source>
-        <translation>使用 STUN 勾選框</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="281"/>
+        <source>STUN Address</source>
+        <translation>STUN 地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1672"/>
+        <location filename="../advancedsipsettingwidget.ui" line="293"/>
         <source>Use STUN</source>
         <translation>使用 STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1688"/>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <source>Server URL</source>
-        <translation>伺服器網址</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1710"/>
-        <source>use TURN checkbox</source>
-        <translation>使用 TURN 勾選框</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="317"/>
+        <source>Use UPnP</source>
+        <translation>使用 UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1716"/>
+        <location filename="../advancedsipsettingwidget.ui" line="329"/>
         <source>Use TURN</source>
         <translation>使用 TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1732"/>
-        <source>TURN server URL input</source>
-        <translation>TURN 伺服器輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1751"/>
-        <source>TURN server username input</source>
-        <translation>TURN 伺服器使用者名稱輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1770"/>
-        <source>TURN server password input</source>
-        <translation>TURN 伺服器密碼輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1792"/>
-        <source>TURN server Realm input</source>
-        <translation>TURN 伺服器範圍輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1795"/>
-        <source>Realm</source>
-        <translation>領域</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1844"/>
-        <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>SDP 工作階段協商(ICE 退回)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1872"/>
-        <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>這些設定將僅用於 SDP 工作階段協商,以防伺服器或對方不支援 ICE。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1914"/>
-        <source>Audio RTP Port Range</source>
-        <translation>音訊 RTP 連接埠範圍</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1944"/>
-        <location filename="../accountdetails.ui" line="2084"/>
-        <source>Min</source>
-        <translation>最小值</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1960"/>
-        <location filename="../accountdetails.ui" line="2100"/>
-        <source>Lower boundary for audio RTP port range selector</source>
-        <translation>音訊 RTP 連接埠的下限範圍選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1978"/>
-        <location filename="../accountdetails.ui" line="2118"/>
-        <source>Max</source>
-        <translation>最大值</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1994"/>
-        <location filename="../accountdetails.ui" line="2134"/>
-        <source>higher boundary for audio RTP port range selector</source>
-        <translation>音訊 RTP 連接埠的上限範圍選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2054"/>
-        <source>Video RTP Port Range</source>
-        <translation>視訊 RTP 連接埠範圍</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2186"/>
-        <source>Security</source>
-        <translation>安全性</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2189"/>
-        <source>Account security configuration</source>
-        <translation>帳號安全性設定</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2276"/>
-        <source>Certificate authaurity certificate selector</source>
-        <translation>憑證簽發者選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2313"/>
-        <source>User certificate selector</source>
-        <translation>使用者憑證選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2371"/>
-        <source>private key password input</source>
-        <translation>私密金鑰密碼輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2393"/>
-        <source>User private key selector</source>
-        <translation>使用者私密金鑰選擇器</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2417"/>
-        <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation>加密媒體串流 (SRTP) 勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2420"/>
-        <source>Media Stream Encryption (SRTP)</source>
-        <translation>媒體串流加密(SRTP)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2432"/>
-        <source>use default ciphers checkbox</source>
-        <translation>使用預設密碼本勾選框</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2488"/>
-        <source>Devices</source>
-        <translation>裝置</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2491"/>
-        <source>Account devices management</source>
-        <translation>帳號裝置管理</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2535"/>
-        <source>Add device button</source>
-        <translation>新增裝置按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2538"/>
-        <source>Add device</source>
-        <translation>新增裝置</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the network</source>
-        <translation>在網路上匯出</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2578"/>
-        <source>Password text input</source>
-        <translation>密碼文字輸入</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2584"/>
-        <source>Password (required)</source>
-        <translation>密碼(必要)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2612"/>
-        <source>Cancel account export for linking button</source>
-        <translation>取消帳號匯出連結按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="786"/>
-        <location filename="../accountdetails.ui" line="2615"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>要新增新裝置到您的 Jami 帳號,您要先在網路上匯出您的帳號。這將會生成 PIN 碼,必須在生成後的 5 分鐘內輸入到您的新裝置上。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
-        <translation>驗證供裝置連結在 DHT 上匯出按鈕</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2696"/>
-        <source>Your generated pin:</source>
-        <translation>您的已生成 PIN 碼:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2709"/>
-        <source>Generated PIN for linking</source>
-        <translation>已生成供連結之 PIN</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="359"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2712"/>
-        <source>PIN</source>
-        <translation>PIN 碼</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="391"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2722"/>
-        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation>這個 PIN 碼應該要在 5 分鐘內於您的新裝置上輸入。您可以在任何時候生成新的。</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="423"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2741"/>
-        <source>Accept PIN generation and quit button</source>
-        <translation>接受 PIN 生成與結束按鈕</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="464"/>
+        <source>Media</source>
+        <translation>媒體</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2744"/>
-        <source>OK</source>
-        <translation>確定</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="515"/>
+        <source>Enable Video</source>
+        <translation>啟用視訊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2769"/>
-        <source>Banned Contacts</source>
-        <translation>黑名單聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2772"/>
-        <source>Account banned contacts management tab</source>
-        <translation>帳號已阻擋聯絡人管理分頁</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1495"/>
-        <source>Published Address</source>
-        <translation>公開位置</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2254"/>
-        <source>CA certificate</source>
-        <translation>CA 證書</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2294"/>
-        <source>User certificate</source>
-        <translation>使用者證書</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2331"/>
-        <source>Private key</source>
-        <translation>私密金鑰</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="539"/>
+        <source>Video Codecs</source>
+        <translation>視訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2346"/>
-        <source>Private key password</source>
-        <translation>私密金鑰密碼</translation>
+        <location filename="../advancedsipsettingwidget.ui" line="692"/>
+        <source>Audio Codecs</source>
+        <translation>音訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2435"/>
-        <source>Use default ciphers</source>
-        <translation>使用預設加密法</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="142"/>
+        <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
+        <translation>音訊檔 (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
-</context>
-<context>
-    <name>AccountItemDelegate</name>
     <message>
-        <location filename="../accountitemdelegate.cpp" line="91"/>
-        <source>Add Account</source>
-        <translation>新增帳號</translation>
+        <location filename="../advancedsipsettingwidget.cpp" line="151"/>
+        <source>Add a custom ringtone</source>
+        <translation>新增自訂鈴聲</translation>
     </message>
 </context>
 <context>
@@ -702,138 +164,142 @@ Jami 是一個安全且分散式的通訊軟體。</translation>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="40"/>
+        <location filename="../advancedsettingswidget.ui" line="61"/>
         <source>Call Settings</source>
         <translation>通話設定</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="65"/>
+        <location filename="../advancedsettingswidget.ui" line="108"/>
         <source>Allow Calls From Untrusted Peers</source>
         <translation>允許來自未受信任使用者的通話</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="79"/>
+        <location filename="../advancedsettingswidget.ui" line="133"/>
         <source>Auto Answer Calls</source>
         <translation>自動回應通話</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="99"/>
+        <location filename="../advancedsettingswidget.ui" line="161"/>
         <source>Enable Custom Ringtone</source>
         <translation>啟用自訂鈴聲</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="120"/>
-        <location filename="../advancedsettingswidget.cpp" line="168"/>
+        <location filename="../advancedsettingswidget.cpp" line="188"/>
         <source>Add a custom ringtone</source>
         <translation>新增自訂鈴聲</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="174"/>
+        <location filename="../advancedsettingswidget.ui" line="225"/>
         <source>Name Server</source>
         <translation>名稱伺服器</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="200"/>
+        <location filename="../advancedsettingswidget.ui" line="275"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="269"/>
+        <location filename="../advancedsettingswidget.ui" line="351"/>
         <source>OpenDHT Configuration</source>
         <translation>OpenDHT 設定</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="297"/>
+        <location filename="../advancedsettingswidget.ui" line="398"/>
         <source>Enable Proxy</source>
         <translation>啟用代理伺服器</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="358"/>
+        <location filename="../advancedsettingswidget.ui" line="454"/>
         <source>Bootstrap</source>
         <translation>Bootstrap</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="427"/>
+        <location filename="../advancedsettingswidget.ui" line="530"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="444"/>
+        <location filename="../advancedsettingswidget.ui" line="571"/>
         <source>Private Key Password</source>
         <translation>私密金鑰密碼</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="456"/>
+        <location filename="../advancedsettingswidget.ui" line="583"/>
         <source>User Certificate</source>
         <translation>使用者憑證</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="483"/>
-        <source>no password</source>
-        <translation>沒有密碼</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="495"/>
+        <location filename="../advancedsettingswidget.ui" line="622"/>
         <source>Private Key</source>
         <translation>私鑰</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="507"/>
+        <location filename="../advancedsettingswidget.ui" line="634"/>
         <source>CA Certificate</source>
         <translation>CA 憑證</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="689"/>
+        <location filename="../advancedsettingswidget.ui" line="766"/>
         <source>Connectivity</source>
         <translation>連線</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="734"/>
-        <source>        TURN Address</source>
-        <translation>        TURN 地址</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="773"/>
+        <location filename="../advancedsettingswidget.ui" line="868"/>
         <source>Use STUN</source>
         <translation>使用 STUN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="800"/>
+        <location filename="../advancedsettingswidget.ui" line="856"/>
         <source>STUN Address</source>
         <translation>STUN 地址</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="812"/>
-        <source>        TURN Username</source>
-        <translation>        TURN 使用者名稱</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="824"/>
-        <source>        TURN Password</source>
-        <translation>        TURN 密碼</translation>
-    </message>
-    <message>
-        <location filename="../advancedsettingswidget.ui" line="836"/>
+        <location filename="../advancedsettingswidget.ui" line="892"/>
         <source>Use UPnP</source>
         <translation>使用 UPnP</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="848"/>
+        <location filename="../advancedsettingswidget.ui" line="904"/>
         <source>Use TURN</source>
         <translation>使用 TURN</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="899"/>
+        <location filename="../advancedsettingswidget.ui" line="934"/>
+        <source>TURN Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="966"/>
+        <source>TURN Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="998"/>
+        <source>TURN Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1039"/>
+        <source>Media</source>
+        <translation>媒體</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1090"/>
+        <source>Enable Video</source>
+        <translation>啟用視訊</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettingswidget.ui" line="1267"/>
         <source>Audio Codecs</source>
         <translation>音訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.ui" line="1044"/>
+        <location filename="../advancedsettingswidget.ui" line="1114"/>
         <source>Video Codecs</source>
         <translation>視訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../advancedsettingswidget.cpp" line="161"/>
+        <location filename="../advancedsettingswidget.cpp" line="181"/>
         <source>Audio Files (*.wav *.ogg *.opus *.mp3 *aiff *wma)</source>
         <translation>音訊檔 (*.wav *.ogg *.opus *.mp3 *aiff *wma)</translation>
     </message>
@@ -847,57 +313,47 @@ Jami 是一個安全且分散式的通訊軟體。</translation>
     </message>
 </context>
 <context>
-    <name>BannedContactsWidget</name>
+    <name>BannedItemWidget</name>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <location filename="../banneditemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="41"/>
-        <source>Banned contacts list</source>
-        <translation>已阻擋聯絡人清單</translation>
+        <location filename="../banneditemwidget.ui" line="80"/>
+        <source>name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="69"/>
-        <source>Banned ID</source>
-        <translation>黑名單 ID</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="101"/>
-        <source>Deban contact button</source>
-        <translation>取消阻擋聯絡人按鈕</translation>
-    </message>
-    <message>
-        <location filename="../bannedcontactswidget.ui" line="104"/>
-        <source>Deban contact, and add to contact list</source>
-        <translation>解除封鎖聯絡人,並加入到聯絡人清單</translation>
+        <location filename="../banneditemwidget.ui" line="104"/>
+        <source>id</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="178"/>
+        <location filename="../callwidget.ui" line="184"/>
         <source>Show conversations</source>
         <translation>顯示對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="181"/>
+        <location filename="../callwidget.ui" line="187"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="362"/>
+        <location filename="../callwidget.ui" line="368"/>
         <source>Search contact text input</source>
         <translation>搜尋聯絡人文字輸入</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="647"/>
+        <location filename="../callwidget.ui" line="653"/>
         <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Jami 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="687"/>
+        <location filename="../callwidget.ui" line="693"/>
         <source>
  This is your ID.
 Copy and share it with your friends!
@@ -908,183 +364,160 @@ Copy and share it with your friends!
                                       </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="800"/>
+        <location filename="../callwidget.ui" line="806"/>
         <source>Show ring ID QR code</source>
         <translation>顯示 Ring ID 二維條碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="851"/>
+        <location filename="../callwidget.ui" line="857"/>
         <source>Share ring ID button</source>
         <translation>分享 Ring ID 按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="909"/>
+        <location filename="../callwidget.ui" line="915"/>
         <source>Double-click to copy</source>
         <translation>雙擊以複製</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="950"/>
+        <location filename="../callwidget.ui" line="956"/>
         <source>Error while generating QR Code</source>
         <translation>產生 QR Code 時發生錯誤</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1178"/>
-        <location filename="../callwidget.ui" line="1428"/>
+        <location filename="../callwidget.ui" line="1184"/>
+        <location filename="../callwidget.ui" line="1434"/>
         <source>best name</source>
         <translation>最佳名稱</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1202"/>
+        <location filename="../callwidget.ui" line="1208"/>
         <source>best Id</source>
         <translation>最佳 ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1728"/>
+        <location filename="../callwidget.ui" line="1734"/>
         <source>Back to homepage button</source>
         <translation>回到首頁按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1937"/>
+        <location filename="../callwidget.ui" line="1943"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="196"/>
+        <location filename="../callwidget.ui" line="202"/>
         <source>Show invites</source>
         <translation>顯示邀請</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="199"/>
+        <location filename="../callwidget.ui" line="205"/>
         <source>Invites</source>
         <translation>邀請</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="371"/>
-        <location filename="../callwidget.cpp" line="553"/>
+        <location filename="../callwidget.ui" line="377"/>
+        <location filename="../callwidget.cpp" line="552"/>
         <source>Find a new or existing contact</source>
         <translation>尋找新的或既有的聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1444"/>
         <source>Wants to talk to you!</source>
         <translation>想要與您說說話!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1511"/>
+        <location filename="../callwidget.ui" line="1517"/>
         <source>Answer incoming call button</source>
         <translation>答覆來電按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1583"/>
+        <location filename="../callwidget.ui" line="1589"/>
         <source>Ignore incoming call button</source>
         <translation>忽略來電按鈕</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1533"/>
+        <location filename="../callwidget.ui" line="1539"/>
         <source>Answer</source>
         <translation>回覆</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1611"/>
+        <location filename="../callwidget.ui" line="1617"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1274"/>
+        <location filename="../callwidget.ui" line="1280"/>
         <source>Cancel outgoing call</source>
         <translation>取消去電</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1305"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="333"/>
+        <location filename="../callwidget.cpp" line="332"/>
         <source>Start video call</source>
         <translation>開始視訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="344"/>
+        <location filename="../callwidget.cpp" line="343"/>
         <source>Start audio call</source>
         <translation>開始音訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="360"/>
+        <location filename="../callwidget.cpp" line="354"/>
         <source>Clear conversation</source>
         <translation>清除對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="367"/>
+        <location filename="../callwidget.cpp" line="361"/>
         <source>Remove contact</source>
         <translation>移除聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="374"/>
+        <location filename="../callwidget.cpp" line="373"/>
         <source>Block contact</source>
         <translation>阻擋連絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="385"/>
+        <location filename="../callwidget.cpp" line="384"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="562"/>
+        <location filename="../callwidget.cpp" line="561"/>
         <source>Search your received invitations</source>
         <translation>搜尋您收到的邀請</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>Contact me on Jami</source>
         <translation>在 Jami 上聯絡我</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="944"/>
+        <location filename="../callwidget.cpp" line="943"/>
         <source>My Id is : </source>
         <translation>我的 Id 是:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="293"/>
-        <source>Message incoming from %1</source>
-        <translation>從 %1 來的訊息</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="848"/>
+        <location filename="../callwidget.cpp" line="847"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="853"/>
+        <location filename="../callwidget.cpp" line="852"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="676"/>
+        <location filename="../callwidget.cpp" line="675"/>
         <source>Call incoming from %1</source>
         <translation>從 %1 的來電</translation>
     </message>
 </context>
-<context>
-    <name>ContactDialog</name>
-    <message>
-        <location filename="../contactdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>對話框</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="26"/>
-        <source>New Contact</source>
-        <translation>新聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactdialog.ui" line="33"/>
-        <source>Enter a name...</source>
-        <translation>輸入名稱……</translation>
-    </message>
-</context>
 <context>
     <name>DeleteAccountDialog</name>
     <message>
@@ -1093,47 +526,52 @@ Copy and share it with your friends!
         <translation>帳號刪除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <location filename="../deleteaccountdialog.ui" line="58"/>
         <source>Do you really want to delete the following account?</source>
         <translation>您真的想要刪除以下的帳號嗎?</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="144"/>
+        <location filename="../deleteaccountdialog.ui" line="153"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation>若此帳號尚未匯出,或是新增到其他裝置,它將會不可逆地遺失。</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="226"/>
+        <location filename="../deleteaccountdialog.ui" line="235"/>
         <source>Permanently delete account</source>
         <translation>永久刪除帳號</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="232"/>
+        <location filename="../deleteaccountdialog.ui" line="241"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="269"/>
+        <location filename="../deleteaccountdialog.ui" line="278"/>
         <source>Cancel account deletion</source>
         <translation>取消帳號刪除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="275"/>
+        <location filename="../deleteaccountdialog.ui" line="284"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
 </context>
 <context>
-    <name>Form</name>
+    <name>DeviceItemWidget</name>
     <message>
-        <location filename="../deviceeditwidget.ui" line="14"/>
+        <location filename="../deviceitemwidget.ui" line="14"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../deviceeditwidget.ui" line="36"/>
-        <source>PushButton</source>
-        <translation>按下按鈕</translation>
+        <location filename="../deviceitemwidget.ui" line="105"/>
+        <source>Device Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deviceitemwidget.ui" line="143"/>
+        <source>this device</source>
+        <translation>此裝置</translation>
     </message>
 </context>
 <context>
@@ -1155,59 +593,69 @@ Copy and share it with your friends!
     </message>
 </context>
 <context>
-    <name>LinkDevWidget</name>
+    <name>LinkDeviceDialog</name>
     <message>
-        <location filename="../linkdevwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>表單</translation>
+        <location filename="../linkdevicedialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>對話框</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.ui" line="62"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="93"/>
-        <source>Add A New Device</source>
-        <translation>新增新的裝置</translation>
+        <location filename="../linkdevicedialog.ui" line="117"/>
+        <source>Password</source>
+        <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="155"/>
-        <source>To add a new device, enter your account password:</source>
-        <translation>要新增新的裝置,輸入您的帳號密碼:</translation>
+        <location filename="../linkdevicedialog.ui" line="184"/>
+        <source>Ok</source>
+        <translation>確定</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="250"/>
+        <location filename="../linkdevicedialog.ui" line="218"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="279"/>
-        <source>Enter</source>
-        <translation>輸入</translation>
+        <location filename="../linkdevicedialog.ui" line="279"/>
+        <source>Exporting account</source>
+        <translation>正在匯出帳號</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="365"/>
-        <source>Exporting account on the network</source>
-        <translation>正在匯出網路上的帳號</translation>
+        <location filename="../linkdevicedialog.ui" line="402"/>
+        <source>Your PIN is</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="509"/>
-        <source>Your generated pin:</source>
-        <translation>您的已生成 PIN 碼:</translation>
+        <location filename="../linkdevicedialog.ui" line="432"/>
+        <source>PIN</source>
+        <translation>PIN 碼</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="609"/>
-        <source>This pin and the account password should be entered in your device within 5 minutes.</source>
-        <translation>這個 PIN 碼與帳號密碼應該要在 5 分鐘之內在您的裝置上輸入。</translation>
+        <location filename="../linkdevicedialog.ui" line="477"/>
+        <source>This pin and the account password should be entered in your device within 10 minutes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../linkdevwidget.ui" line="652"/>
+        <location filename="../linkdevicedialog.ui" line="553"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="81"/>
-        <source>Your account password was incorrect</source>
-        <translation>您的帳號密碼不正確</translation>
+        <location filename="../linkdevicedialog.cpp" line="34"/>
+        <source>Link Another Device</source>
+        <translation>聯結其他裝置</translation>
+    </message>
+    <message>
+        <location filename="../linkdevicedialog.cpp" line="96"/>
+        <source>Incorrect password</source>
+        <translation>不正確的密碼</translation>
     </message>
     <message>
-        <location filename="../linkdevwidget.cpp" line="92"/>
+        <location filename="../linkdevicedialog.cpp" line="110"/>
         <source>Something went wrong.
 Please try again later.</source>
         <translation>有東西出問題了。
@@ -1217,17 +665,17 @@ Please try again later.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="74"/>
+        <location filename="../mainwindow.cpp" line="83"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
+        <location filename="../mainwindow.cpp" line="94"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="99"/>
+        <location filename="../mainwindow.cpp" line="111"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
@@ -1237,6 +685,69 @@ Please try again later.</source>
         <translation>Jami</translation>
     </message>
 </context>
+<context>
+    <name>NameRegistrationDialog</name>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="35"/>
+        <source>Set Registered Name</source>
+        <translation>設定已註冊的名稱</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="163"/>
+        <source>Enter your account password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="244"/>
+        <source>Password text input</source>
+        <translation>密碼文字輸入</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="250"/>
+        <source>Password text entry</source>
+        <translation>密碼文字項目</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="256"/>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="323"/>
+        <source>Register</source>
+        <translation>註冊</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="357"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="424"/>
+        <source>Registering Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="548"/>
+        <source>Something went wrong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.ui" line="618"/>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="82"/>
+        <source>Incorrect password</source>
+        <translation>不正確的密碼</translation>
+    </message>
+    <message>
+        <location filename="../nameregistrationdialog.cpp" line="85"/>
+        <source>Network error</source>
+        <translation>網路錯誤</translation>
+    </message>
+</context>
 <context>
     <name>NewWizardWidget</name>
     <message>
@@ -1255,47 +766,62 @@ Please try again later.</source>
         <translation>歡迎來到</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="179"/>
+        <location filename="../newwizardwidget.ui" line="185"/>
         <source>Welcome Logo</source>
         <translation>歡迎圖示</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="228"/>
+        <location filename="../newwizardwidget.ui" line="239"/>
         <source>Create Jami account button</source>
         <translation>建立 Jami 帳號按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="234"/>
+        <location filename="../newwizardwidget.ui" line="245"/>
         <source>Push button for Jami account creation start trigger</source>
         <translation>Jami 帳號建立開始觸發請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="240"/>
+        <location filename="../newwizardwidget.ui" line="251"/>
         <source>Create a Jami account</source>
         <translation>建立 Jami 帳號</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="266"/>
+        <location filename="../newwizardwidget.ui" line="282"/>
         <source>Link device button</source>
         <translation>連結裝置按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="272"/>
+        <location filename="../newwizardwidget.ui" line="288"/>
         <source>Push button for device linkage start trigger</source>
         <translation>裝置連結開始觸發請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="275"/>
+        <location filename="../newwizardwidget.ui" line="291"/>
         <source>Link this device to an account</source>
         <translation>連結這個裝置到一個帳號</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="328"/>
+        <source>Create Jami SIP account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="334"/>
+        <source>Push button for Jami SIP account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="../newwizardwidget.ui" line="340"/>
+        <source>Create a SIP account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="405"/>
         <source>Link this device to an existing account</source>
         <translation>連結此裝置到既有的帳號</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="399"/>
+        <location filename="../newwizardwidget.ui" line="469"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1318,49 +844,51 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; color:#555555;&quot;&gt;您將會取得所需的 PIN 碼來完成此表單。PIN 只在&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:14px; font-weight:600; color:#555555;&quot;&gt;10 分鐘&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10px; color:#555555;&quot;&gt;內有效。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="461"/>
+        <location filename="../newwizardwidget.ui" line="531"/>
         <source>Enter your pin:</source>
         <translation>輸入您的 PIN 碼:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="529"/>
+        <location filename="../newwizardwidget.ui" line="599"/>
         <source>Or import a file:</source>
         <translation>或是匯入檔案:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="556"/>
+        <location filename="../newwizardwidget.ui" line="626"/>
         <source>Link from exported account archive file</source>
         <translation>從已匯出的帳號封存檔連結</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="559"/>
-        <location filename="../newwizardwidget.cpp" line="86"/>
-        <location filename="../newwizardwidget.cpp" line="227"/>
+        <location filename="../newwizardwidget.ui" line="629"/>
+        <location filename="../newwizardwidget.cpp" line="83"/>
+        <location filename="../newwizardwidget.cpp" line="218"/>
         <source>(None)</source>
         <translation>(無)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="635"/>
+        <location filename="../newwizardwidget.ui" line="705"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="729"/>
+        <location filename="../newwizardwidget.ui" line="799"/>
+        <location filename="../newwizardwidget.ui" line="1586"/>
         <source>Profile</source>
         <translation>介紹</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="883"/>
+        <location filename="../newwizardwidget.ui" line="953"/>
+        <location filename="../newwizardwidget.ui" line="1767"/>
         <source>Profile name</source>
         <translation>個人檔案名稱</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="957"/>
+        <location filename="../newwizardwidget.ui" line="1027"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1143"/>
+        <location filename="../newwizardwidget.ui" line="1136"/>
         <source>Register your username.
 This will reserve the username so that only you can use it.
 Your friends will be able to call you with your usename
@@ -1371,138 +899,195 @@ instead of using your ID.</source>
 而不用使用您的 ID。</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1149"/>
+        <location filename="../newwizardwidget.ui" line="1142"/>
         <source>Public username checkbox</source>
         <translation>公開使用者名稱勾選框</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1152"/>
+        <location filename="../newwizardwidget.ui" line="1145"/>
         <source>Checkbox selecting if the user wants a public username</source>
         <translation>若使用者想要一個公開的使用者名稱就在勾選框打勾</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1155"/>
+        <location filename="../newwizardwidget.ui" line="1148"/>
         <source>Register public username</source>
         <translation>註冊公開使用者名稱</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1234"/>
+        <location filename="../newwizardwidget.ui" line="1367"/>
         <source>Public username edit</source>
         <translation>公開使用者名稱編輯</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1240"/>
+        <location filename="../newwizardwidget.ui" line="1373"/>
         <source>Choose your username</source>
         <translation>選擇您的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1306"/>
+        <location filename="../newwizardwidget.ui" line="1289"/>
         <source>Password text input</source>
         <translation>密碼文字輸入</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1312"/>
+        <location filename="../newwizardwidget.ui" line="1295"/>
         <source>Password text entry</source>
         <translation>密碼文字項目</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1318"/>
+        <location filename="../newwizardwidget.ui" line="1301"/>
+        <location filename="../newwizardwidget.ui" line="2213"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1384"/>
-        <location filename="../newwizardwidget.ui" line="1390"/>
+        <location filename="../newwizardwidget.ui" line="1211"/>
+        <location filename="../newwizardwidget.ui" line="1217"/>
         <source>Password confirmation text input</source>
         <translation>確認密碼文字輸入</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1396"/>
+        <location filename="../newwizardwidget.ui" line="1223"/>
         <source>Confirm password</source>
         <translation>確認密碼</translation>
     </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1814"/>
+        <source>SIP Account</source>
+        <translation>SIP 帳號</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1973"/>
+        <source>SIP Server edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="1979"/>
+        <source>Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2045"/>
+        <source>SIP proxy input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2051"/>
+        <source>SIP proxy text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2057"/>
+        <source>Proxy</source>
+        <translation>代理服務器</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2123"/>
+        <source>SIP username input</source>
+        <translation>SIP 使用者名稱輸入</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2129"/>
+        <source>SIP Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2135"/>
+        <source>Username</source>
+        <translation>使用者名稱</translation>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.ui" line="2201"/>
+        <location filename="../newwizardwidget.ui" line="2207"/>
+        <source>SIP Password text input</source>
+        <translation type="unfinished"/>
+    </message>
     <message utf8="true">
-        <location filename="../newwizardwidget.ui" line="1465"/>
+        <location filename="../newwizardwidget.ui" line="2282"/>
         <source>Generating your Jami account…</source>
         <translation>正在生成您的 Jami 帳號……</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1539"/>
+        <location filename="../newwizardwidget.ui" line="2356"/>
         <source>Previous page button</source>
         <translation>先前頁面按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1545"/>
+        <location filename="../newwizardwidget.ui" line="2362"/>
         <source>push button to access previous page of wizard</source>
         <translation>存取前一頁精靈請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1548"/>
+        <location filename="../newwizardwidget.ui" line="2365"/>
         <source>Previous</source>
         <translation>前一個</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1579"/>
+        <location filename="../newwizardwidget.ui" line="2396"/>
         <source>Cancel account create/link</source>
         <translation>取消帳號建立/連結</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1585"/>
+        <location filename="../newwizardwidget.ui" line="2402"/>
         <source>push button to cancel account creation or linking</source>
         <translation>按下按鈕以取消帳號建立或連結</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1588"/>
+        <location filename="../newwizardwidget.ui" line="2405"/>
         <source>Back</source>
         <translation>前一個</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1625"/>
+        <location filename="../newwizardwidget.ui" line="2442"/>
         <source>Next page Button</source>
         <translation>下一頁按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1631"/>
+        <location filename="../newwizardwidget.ui" line="2448"/>
         <source>Push button to access next page of wizard</source>
         <translation>存取下一頁精靈請按下按鈕</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.ui" line="1634"/>
+        <location filename="../newwizardwidget.ui" line="2451"/>
         <source>Next</source>
         <translation>下一個</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="78"/>
+        <location filename="../newwizardwidget.cpp" line="75"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="80"/>
+        <location filename="../newwizardwidget.cpp" line="77"/>
         <source>Jami archive files (*.gz); All files (*)</source>
         <translation>Jami 封存檔 (*.gz); 所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="126"/>
+        <location filename="../newwizardwidget.cpp" line="123"/>
         <source>Your account needs to be migrated. Enter your password.</source>
         <translation>您的帳號需要遷移。輸入您的密碼。</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="166"/>
+        <location filename="../newwizardwidget.cpp" line="419"/>
         <source>Migrating your Jami account...</source>
         <translation>正在遷移您的 Jami 帳號……</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="168"/>
+        <location filename="../newwizardwidget.cpp" line="412"/>
         <source>Importing account archive...</source>
         <translation>正在匯入帳號封存檔……</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="170"/>
+        <location filename="../newwizardwidget.cpp" line="404"/>
         <source>Generating your Jami account...</source>
         <translation>正在生成您的 Jami 帳號……</translation>
     </message>
     <message>
-        <location filename="../newwizardwidget.cpp" line="469"/>
+        <location filename="../newwizardwidget.cpp" line="422"/>
+        <source>Generating your SIP account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../newwizardwidget.cpp" line="533"/>
         <source>Error creating account</source>
         <translation>無法建立帳號</translation>
     </message>
@@ -1515,37 +1100,32 @@ instead of using your ID.</source>
         <translation>變更帳號密碼</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="58"/>
+        <location filename="../passworddialog.ui" line="97"/>
         <source>Enter Current Password</source>
         <translation>輸入目前的密碼</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="90"/>
+        <location filename="../passworddialog.ui" line="169"/>
         <source>Enter New Password</source>
         <translation>輸入新密碼</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="106"/>
+        <location filename="../passworddialog.ui" line="190"/>
         <source>Confirm New Password</source>
         <translation>確認新密碼</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="136"/>
+        <location filename="../passworddialog.ui" line="247"/>
         <source>Confirm</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="../passworddialog.ui" line="155"/>
+        <location filename="../passworddialog.ui" line="290"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../passworddialog.cpp" line="90"/>
-        <source>Password Changed Successfully</source>
-        <translation>密碼變更成功</translation>
-    </message>
-    <message>
-        <location filename="../passworddialog.cpp" line="105"/>
+        <location filename="../passworddialog.ui" line="143"/>
         <source>Current Password Incorrect</source>
         <translation>目前的密碼不正確</translation>
     </message>
@@ -1566,17 +1146,17 @@ instead of using your ID.</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="129"/>
+        <location filename="../photoboothwidget.ui" line="120"/>
         <source>Photobooth display</source>
         <translation>大頭貼相機顯示</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="91"/>
+        <location filename="../photoboothwidget.cpp" line="92"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.cpp" line="93"/>
+        <location filename="../photoboothwidget.cpp" line="94"/>
         <source>Image Files (*.jpg *.jpeg *.png)</source>
         <translation>圖片檔 (*.jpg *.jpeg *.png)</translation>
     </message>
@@ -1584,12 +1164,12 @@ instead of using your ID.</source>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="363"/>
+        <location filename="../messagewebview.cpp" line="374"/>
         <source>Files (*)</source>
         <translation>檔案 (*)</translation>
     </message>
@@ -1597,83 +1177,30 @@ instead of using your ID.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="183"/>
         <source>No default mail client found</source>
         <translation>找不到預設的電子郵件客戶端</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="67"/>
+        <location filename="../deviceitemwidget.cpp" line="43"/>
+        <location filename="../deviceitemwidget.cpp" line="85"/>
         <source>Edit Device Name</source>
         <translation>編輯裝置名稱</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="73"/>
+        <location filename="../deviceitemwidget.cpp" line="44"/>
         <source>Unlink Device From Account</source>
         <translation>從帳號取消連結裝置</translation>
     </message>
     <message>
-        <location filename="../settingsitemwidget.cpp" line="89"/>
-        <source>Unblock Contact</source>
-        <translation>取消封鎖聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../newwizardwidget.cpp" line="35"/>
-        <source>Jami account</source>
-        <comment>Default alias for new Jami account</comment>
-        <translation>Jami 帳號</translation>
-    </message>
-</context>
-<context>
-    <name>RegNameDialog</name>
-    <message>
-        <location filename="../regnamedialog.ui" line="29"/>
-        <source>Set Registered Name</source>
-        <translation>設定已註冊的名稱</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="93"/>
-        <source>Are you sure you would like to register this name?</source>
-        <translation>您確定您想要註冊這個名稱?</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="130"/>
-        <source>Once associated to this account, it cannot be changed.</source>
-        <translation>與此帳號連結後,就無法變更了。</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="167"/>
-        <source>Your new registered name would be:</source>
-        <translation>您新註冊的名稱將是:</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="283"/>
-        <source>Confirm Registration</source>
-        <translation>確認註冊</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="315"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="453"/>
-        <source>The name has been successfully registered!</source>
-        <translation>已成功註冊名稱</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="512"/>
-        <source>Something went wrong.</source>
-        <translation>有東西出問題了。</translation>
-    </message>
-    <message>
-        <location filename="../regnamedialog.ui" line="549"/>
-        <source>Please try again later</source>
-        <translation>請稍後再試</translation>
+        <location filename="../deviceitemwidget.cpp" line="80"/>
+        <source>Save new device name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../regnamedialog.ui" line="602"/>
-        <source>Your account does not have a registered name</source>
-        <translation>您的帳號沒有已註冊的名稱</translation>
+        <location filename="../banneditemwidget.cpp" line="39"/>
+        <source>Add as contact</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1684,49 +1211,6 @@ instead of using your ID.</source>
         <translation>選擇資料夾</translation>
     </message>
 </context>
-<context>
-    <name>SetAvatarDialog</name>
-    <message>
-        <location filename="../setavatardialog.ui" line="32"/>
-        <source>Change Your Avatar Image</source>
-        <translation>變更您的大頭貼圖片</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="134"/>
-        <source>Save</source>
-        <translation>儲存</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="153"/>
-        <source>Take Picture</source>
-        <translation>拍照</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="169"/>
-        <source>Camera</source>
-        <translation>攝影機</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="185"/>
-        <source>Select A File</source>
-        <translation>選取檔案</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.ui" line="204"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Open Image</source>
-        <translation>開啟圖片</translation>
-    </message>
-    <message>
-        <location filename="../setavatardialog.cpp" line="143"/>
-        <source>Image Files (*.jpg *.jpeg *.png *.bmp)</source>
-        <translation>圖片檔 (*.jpg *.jpeg *.png *.bmp)</translation>
-    </message>
-</context>
 <context>
     <name>SettingsWidget</name>
     <message>
@@ -1735,283 +1219,315 @@ instead of using your ID.</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="147"/>
+        <location filename="../settingswidget.ui" line="141"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="254"/>
-        <location filename="../settingswidget.ui" line="1461"/>
+        <location filename="../settingswidget.ui" line="229"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="298"/>
+        <location filename="../settingswidget.ui" line="267"/>
+        <location filename="../settingswidget.ui" line="503"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="342"/>
+        <location filename="../settingswidget.ui" line="305"/>
+        <location filename="../settingswidget.ui" line="3416"/>
         <source>Audio / Video</source>
         <translation>音訊/視訊</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="524"/>
+        <location filename="../settingswidget.ui" line="542"/>
         <source>System</source>
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="560"/>
-        <source>enable notifications checkbox</source>
-        <translation>啟用通知勾選框</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="566"/>
+        <location filename="../settingswidget.ui" line="610"/>
         <source>Enable desktop notifications</source>
         <translation>啟用桌面通知</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="588"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>在關閉時最小化勾選框</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="594"/>
+        <location filename="../settingswidget.ui" line="653"/>
         <source>Keep minimized on close</source>
         <translation>在關閉時保持最小化</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="635"/>
+        <location filename="../settingswidget.ui" line="678"/>
         <source>Download folder</source>
         <translation>下載資料夾</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="716"/>
-        <source>Recordings</source>
-        <translation>記錄</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="754"/>
+        <location filename="../settingswidget.ui" line="811"/>
         <source>Save in</source>
         <translation>儲存在</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="829"/>
+        <location filename="../settingswidget.ui" line="904"/>
         <source>Always Recording</source>
         <translation>總是錄製</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="858"/>
+        <location filename="../settingswidget.ui" line="943"/>
         <source>Updates</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="897"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>自動檢查更新勾選框</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="903"/>
+        <location filename="../settingswidget.ui" line="1008"/>
         <source>Check for updates automatically every</source>
         <translation>自動檢查更新每</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="927"/>
+        <location filename="../settingswidget.ui" line="1032"/>
         <source>Interval between update checks in days selector</source>
         <translation>檢查更新間隔(以天計)選擇器</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="930"/>
+        <location filename="../settingswidget.ui" line="1038"/>
         <source> days</source>
         <translation>天</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="986"/>
+        <location filename="../settingswidget.ui" line="1081"/>
         <source>Check for updates now button</source>
         <translation>立刻檢查更新按鈕</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="994"/>
+        <location filename="../settingswidget.ui" line="1084"/>
         <source>Check for updates now</source>
         <translation>現在檢查更新</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1523"/>
-        <source>Registered Name</source>
-        <translation>已註冊的名稱</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1583"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="1633"/>
+        <location filename="../settingswidget.ui" line="3027"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1709"/>
+        <location filename="../settingswidget.ui" line="1418"/>
+        <location filename="../settingswidget.ui" line="2729"/>
         <source>Enable</source>
         <translation>啟用</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1778"/>
+        <location filename="../settingswidget.ui" line="607"/>
+        <source>toggle enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="650"/>
+        <source>Toggle keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="764"/>
+        <source>Call Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1005"/>
+        <source>Toggle automatic updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1231"/>
+        <source>Jami Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1453"/>
+        <location filename="../settingswidget.ui" line="2761"/>
+        <source>Profile</source>
+        <translation>介紹</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1567"/>
+        <location filename="../settingswidget.ui" line="2875"/>
+        <source>Identity</source>
+        <translation>身份</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1614"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1673"/>
+        <source>Registered name</source>
+        <translation>已註冊的名稱</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1721"/>
         <source>Type here to register a username</source>
         <translation>在此輸入以註冊使用者名稱</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="1934"/>
+        <location filename="../settingswidget.ui" line="1755"/>
+        <source>Register</source>
+        <translation>註冊</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="1827"/>
         <source>Change Password</source>
         <translation>變更密碼</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2012"/>
+        <location filename="../settingswidget.ui" line="1868"/>
         <source>Export Account</source>
         <translation>匯出帳號</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2038"/>
+        <location filename="../settingswidget.ui" line="1909"/>
+        <location filename="../settingswidget.ui" line="3089"/>
         <source>Delete Account</source>
         <translation>刪除帳號</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2125"/>
-        <location filename="../settingswidget.cpp" line="543"/>
-        <location filename="../settingswidget.cpp" line="572"/>
+        <location filename="../settingswidget.ui" line="1973"/>
         <source>Linked Devices</source>
         <translation>已連結的裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2185"/>
+        <location filename="../settingswidget.ui" line="2078"/>
         <source>Link Another Device</source>
         <translation>聯結其他裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2277"/>
-        <location filename="../settingswidget.cpp" line="544"/>
-        <location filename="../settingswidget.cpp" line="571"/>
-        <source>Blocked Contacts</source>
-        <translation>已封鎖的聯絡人</translation>
+        <location filename="../settingswidget.ui" line="2142"/>
+        <source>Banned Contacts</source>
+        <translation>黑名單聯絡人</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3788"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3831"/>
+        <source>Video device framerate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3967"/>
+        <source>Preview unavailable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2371"/>
+        <location filename="../settingswidget.ui" line="2359"/>
+        <location filename="../settingswidget.ui" line="3187"/>
         <source>Advanced Account Settings</source>
         <translation>進階帳號設定</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2611"/>
+        <location filename="../settingswidget.ui" line="2554"/>
+        <source>SIP Account</source>
+        <translation>SIP 帳號</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2925"/>
+        <source>Username</source>
+        <translation>使用者名稱</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2958"/>
+        <source>Hostname</source>
+        <translation>主機名稱</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="2991"/>
+        <source>Proxy</source>
+        <translation>代理服務器</translation>
+    </message>
+    <message>
+        <location filename="../settingswidget.ui" line="3461"/>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2648"/>
+        <location filename="../settingswidget.ui" line="3511"/>
         <source>Microphone</source>
         <translation>麥克風</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2683"/>
+        <location filename="../settingswidget.ui" line="3551"/>
         <source>Audio input device selector</source>
         <translation>音訊輸入裝置選擇器</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2717"/>
+        <location filename="../settingswidget.ui" line="3585"/>
         <source>Output Device</source>
         <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2752"/>
+        <location filename="../settingswidget.ui" line="3625"/>
         <source>Choose the output device</source>
         <translation>選擇輸出裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2809"/>
+        <location filename="../settingswidget.ui" line="3682"/>
         <source>Video</source>
         <translation>視訊</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2831"/>
+        <location filename="../settingswidget.ui" line="3720"/>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2872"/>
+        <location filename="../settingswidget.ui" line="3766"/>
         <source>Video device selector</source>
         <translation>視訊裝置選擇器</translation>
     </message>
     <message>
-        <location filename="../settingswidget.ui" line="2891"/>
-        <source>Resolution</source>
-        <translation>解析度</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="2932"/>
-        <source>Video device resolution selector</source>
-        <translation>視訊裝置解析度選擇器</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.ui" line="3074"/>
-        <source>Preview unavailable during call</source>
-        <translation>在通話時預覽不可用</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="74"/>
-        <source>Enter the displayed name</source>
-        <translation>輸入顯示名稱</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="391"/>
-        <location filename="../settingswidget.cpp" line="393"/>
+        <location filename="../settingswidget.cpp" line="459"/>
         <source>A registered name should not have any spaces and must be at least three letters long</source>
         <translation>註冊的使用者名稱不應該有任何空格,且必須至少有三個字母</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="400"/>
+        <location filename="../settingswidget.cpp" line="466"/>
         <source>This name is already taken</source>
         <translation>這個名字已經有人用了</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="402"/>
-        <source>This registered name is already taken</source>
-        <translation>這個已註冊的名字有人用了</translation>
-    </message>
-    <message>
-        <location filename="../settingswidget.cpp" line="409"/>
-        <source>This name is available</source>
-        <translation>這個名稱可用</translation>
+        <location filename="../settingswidget.cpp" line="92"/>
+        <location filename="../settingswidget.cpp" line="110"/>
+        <source>Enter an alias</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="411"/>
+        <location filename="../settingswidget.cpp" line="473"/>
         <source>Register this name</source>
         <translation>註冊這個名字</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="493"/>
+        <location filename="../settingswidget.cpp" line="550"/>
         <source>Remove Device</source>
         <translation>移除裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="494"/>
+        <location filename="../settingswidget.cpp" line="551"/>
         <source>Enter this account&apos;s password to confirm the removal of this device</source>
         <translation>輸入這個帳號的密碼以確認移除此裝置</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="500"/>
-        <source>Please confirm that you wish to remove this device</source>
-        <translation>請確認您想要移除此裝置</translation>
+        <location filename="../settingswidget.cpp" line="558"/>
+        <source>Are you sure you wish to remove this device?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="530"/>
+        <location filename="../settingswidget.cpp" line="589"/>
         <source>Export Account Here</source>
         <translation>在此匯出帳號</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="785"/>
+        <location filename="../settingswidget.cpp" line="887"/>
         <source>Select A Folder For Your Downloads</source>
         <translation>選取您的下載資料夾</translation>
     </message>
     <message>
-        <location filename="../settingswidget.cpp" line="809"/>
+        <location filename="../settingswidget.cpp" line="904"/>
         <source>Select A Folder For Your Recordings</source>
         <translation>選取您的錄音資料夾</translation>
     </message>
-- 
GitLab