diff --git a/translations/it.qm b/translations/it.qm
index f4945ef5b..21911d9f9 100644
Binary files a/translations/it.qm and b/translations/it.qm differ
diff --git a/translations/it.ts b/translations/it.ts
index 80933d3e8..445a76cfd 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -17,47 +17,47 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="75"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="78"/>
         <source>Video Settings</source>
         <translation>Impostazioni Video</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="86"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="89"/>
         <source>Resolution</source>
         <translation>Risoluzione</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="38"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="41"/>
         <source>Volume Settings (Stubs)</source>
         <translation>Impostazioni Audio (Stub)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="51"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="54"/>
         <source>Playback</source>
         <translation>Altoparlanti</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="44"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="47"/>
         <source>Microphone</source>
         <translation>Microfono</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="103"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="106"/>
         <source>Hue</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="117"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="120"/>
         <source>Brightness</source>
         <translation>Luminoistà</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="131"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="134"/>
         <source>Saturation</source>
         <translation>Saturazione</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/avsettings.ui" line="145"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="148"/>
         <source>Contrast</source>
         <translation>Contrasto</translation>
     </message>
@@ -145,7 +145,12 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="106"/>
+        <location filename="../src/widget/form/chatform.cpp" line="62"/>
+        <source>Load History...</source>
+        <translation>Carica log...</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="113"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
@@ -153,25 +158,94 @@
 <context>
     <name>Core</name>
     <message>
-        <location filename="../src/core.cpp" line="231"/>
+        <location filename="../src/core.cpp" line="239"/>
         <source>Toxing on qTox</source>
         <translation>Toxing on qTox</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="232"/>
+        <location filename="../src/core.cpp" line="240"/>
         <source>qTox User</source>
         <translation>qTox User</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1106"/>
-        <source>Encrypted profile</source>
-        <translation>Profilo criptato</translation>
+        <location filename="../src/core.cpp" line="1107"/>
+        <location filename="../src/core.cpp" line="1127"/>
+        <source>Tox datafile decryption password</source>
+        <translation>Password per decriptare il Tox datafile</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="1107"/>
-        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
-Do you want to erase this profile ?</source>
-        <translation>Il tuo profilo Tox sembra essere criptato, qTox non può aprirlo\nVuoi eliminare questo profilo?</translation>
+        <location filename="../src/core.cpp" line="1109"/>
+        <location filename="../src/core.cpp" line="1129"/>
+        <location filename="../src/core.cpp" line="1142"/>
+        <location filename="../src/core.cpp" line="1178"/>
+        <source>Password error</source>
+        <translation>Errore password</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1109"/>
+        <location filename="../src/core.cpp" line="1129"/>
+        <location filename="../src/core.cpp" line="1178"/>
+        <source>Failed to setup password.
+Empty password.</source>
+        <translation>Impossibile impostare la password.
+Password vuota.</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1138"/>
+        <source>Try Again</source>
+        <translation>Riprova</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1139"/>
+        <source>Change profile</source>
+        <translation>Cambia profilo</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1140"/>
+        <source>Reinit current profile</source>
+        <translation>Reinizializza il profilo corrente</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1143"/>
+        <source>Wrong password has been entered</source>
+        <translation>È stata inserita una password sbagliata</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1176"/>
+        <source>History Log decryption password</source>
+        <translation>Password per decriptare i log</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1183"/>
+        <source>Encrypted log</source>
+        <translation>Log criptato</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1184"/>
+        <source>Your history encrypted with different password
+Do you want to try another password?</source>
+        <translation>Il log è criptato con una password diversa.
+Vuoi provare un&apos;altra password?</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1192"/>
+        <source>Loggin</source>
+        <translation>Logging</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1192"/>
+        <source>Due to incorret password logging will be disabled</source>
+        <translation>I log saranno disabilitati a causa di una password incorretta</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1279"/>
+        <source>NO Password</source>
+        <translation>Nessuna password</translation>
+    </message>
+    <message>
+        <location filename="../src/core.cpp" line="1279"/>
+        <source>Will be saved without encryption!</source>
+        <translation>Il Tox datafile sarà salvato senza password!</translation>
     </message>
 </context>
 <context>
@@ -318,149 +392,149 @@ Do you want to erase this profile ?</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="29"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="53"/>
         <source>General Settings</source>
         <translation>Impostazioni Generali</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="37"/>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="53"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="61"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="77"/>
         <source>The translation may not load until qTox restarts.</source>
         <translation>La traduzione potrebbe non essere caricata fino al prossimo riavvio di qTox.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="40"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="64"/>
         <source>Translation:</source>
         <translation>Lingua:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="108"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="132"/>
         <source>Auto away after (0 to disable):</source>
         <translation>Imposta assenza dopo:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="121"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="145"/>
         <source>Set to 0 to disable</source>
         <translation>Imposta 0 per disabilitare</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="153"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="177"/>
         <source>Smiley Pack:</source>
         <extracomment>Text on smiley pack label</extracomment>
         <translation>Emoticons:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="228"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="255"/>
         <source>Style:</source>
         <translation>Stile:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="250"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="277"/>
         <source>Connection Settings</source>
         <translation>Impostazioni Connessione</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="256"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="289"/>
         <source>Enable IPv6 (recommended)</source>
         <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="62"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="86"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="65"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="89"/>
         <source>Make Tox portable</source>
         <translation>Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="72"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="96"/>
         <source>Start in tray</source>
         <translation>Avvia minimizzato nella traybar</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="79"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="103"/>
         <source>Close to tray</source>
         <translation>Chiudi nella traybar</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="86"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="110"/>
         <source>Minimize to tray</source>
         <translation>Minimizza nella traybar</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="93"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="117"/>
         <source>Show contacts&apos; status changes</source>
         <translation>Mostra quando i contatti cambiano stato</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="102"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="126"/>
         <source>Provided in minutes</source>
         <translation>Espresso in minuti</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="127"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="151"/>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="145"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="169"/>
         <source>Theme</source>
         <translation>Impostazioni Tema</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="174"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="201"/>
         <source>:)</source>
         <translation>:)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="184"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="211"/>
         <source>;)</source>
         <translation>;)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="194"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="221"/>
         <source>:p</source>
         <translation>:p</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="204"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="231"/>
         <source>:O</source>
         <translation>:O</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="214"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="241"/>
         <source>:&apos;(</source>
         <translation>:&apos;(</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="273"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="306"/>
         <source>Use proxy (SOCKS5)</source>
         <translation>Usa proxy (SOCKS5)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="282"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="318"/>
         <source>Address</source>
         <extracomment>Text on proxy addr label</extracomment>
         <translation>IP</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="292"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="328"/>
         <source>Port</source>
         <extracomment>Text on proxy port label</extracomment>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="266"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="299"/>
         <source>Disable UDP (not recommended)</source>
         <extracomment>Text on checkbox to disable UDP</extracomment>
         <translation>Disabilita connessioni UDP (non raccomandato)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="263"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="296"/>
         <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>Questo permette di usare qTox con Tor; tuttavia aggiunge carico alla rete Tox, quindi usalo solo se necessario.</translation>
@@ -469,22 +543,67 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="151"/>
-        <location filename="../src/widget/form/genericchatform.cpp" line="157"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="56"/>
+        <source>Send message</source>
+        <translation>Invia messaggio</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="58"/>
+        <source>Smileys</source>
+        <translation>Emoticons</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="62"/>
+        <source>Send a file</source>
+        <translation>Invia un file</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="65"/>
+        <source>Audio call</source>
+        <translation>Chiamata audio</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="68"/>
+        <source>Video call</source>
+        <translation>Videochiamata</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="71"/>
+        <source>Toggle speakers volume</source>
+        <translation>Cambia il volume degli altoparlanti</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="74"/>
+        <source>Toggle microphone</source>
+        <translation>Attiva/Disattiva microfono</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="133"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="173"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="134"/>
+        <source>Clear displayed messages</source>
+        <translation>Rimuovi messaggi visualizzati</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="253"/>
+        <source>Cleared</source>
+        <translation>Pulito</translation>
+    </message>
 </context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="48"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="49"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/groupchatform.cpp" line="82"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
@@ -513,108 +632,108 @@ Do you want to erase this profile ?</source>
 <context>
     <name>IdentityForm</name>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="34"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="35"/>
         <source>Identity</source>
         <translation>Identità</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="112"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="113"/>
         <source>Call active</source>
         <comment>popup title</comment>
         <translation>Chiamata in corso</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="113"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="114"/>
         <source>You can&apos;t switch profiles while a call is active!</source>
         <comment>popup text</comment>
         <translation>Non puoi cambiare profilo durante una chiamata!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="123"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="124"/>
         <source>Rename &quot;%1&quot;</source>
         <comment>renaming a profile</comment>
         <translation>Rinomina &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="131"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="132"/>
         <source>Profile already exists</source>
         <comment>rename confirm title</comment>
         <translation>Profilo già esistente</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="132"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="133"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>rename confirm text</comment>
         <translation>Un profilo chiamato &quot;%1&quot; esiste già. Vuoi sovrascriverlo?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="145"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="147"/>
         <source>Export profile</source>
         <comment>save dialog title</comment>
         <translation>Esporta profilo</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="147"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="149"/>
         <source>Tox save file (*.tox)</source>
         <comment>save dialog filter</comment>
         <translation>Tox save file (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="156"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="158"/>
         <source>Profile currently loaded</source>
         <comment>current profile deletion warning title</comment>
         <translation>Profilo attualmente in uso</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="156"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="158"/>
         <source>This profile is currently in use. Please load a different profile before deleting this one.</source>
         <comment>current profile deletion warning text</comment>
         <translation>Questo profilo è attualmente in uso. Per favore carica un profilo differente prima di eliminare questo.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="160"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="162"/>
         <source>Deletion imminent!</source>
         <comment>deletion confirmation title</comment>
         <translation>Eliminazione imminente!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="161"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="163"/>
         <source>Are you sure you want to delete this profile?</source>
         <comment>deletion confirmation text</comment>
         <translation>Sei sicuro di voler eliminare questo profilo?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="172"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="174"/>
         <source>Import profile</source>
         <comment>import dialog title</comment>
         <translation>Importa profilo</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="172"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="174"/>
         <source>Tox save file (*.tox)</source>
         <comment>import dialog filter</comment>
         <translation>Tox save file (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="181"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="183"/>
         <source>Ignoring non-Tox file</source>
         <comment>popup title</comment>
         <translation>File ignorato</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="181"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="183"/>
         <source>Warning: you&apos;ve chosen a file that is not a Tox save file; ignoring.</source>
         <comment>popup text</comment>
         <translation>Attenzione: hai scelto un file che non contiente un profilo Tox.\nQuesto file verrà ignorato.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="185"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="187"/>
         <source>Profile already exists</source>
         <comment>import confirm title</comment>
         <translation>Profilo già esistente</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="188"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>import confirm text</comment>
         <translation>Un profilo chiamato &quot;%1&quot; esiste già. Vuoi sovrascriverlo?</translation>
@@ -628,83 +747,109 @@ Do you want to erase this profile ?</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="20"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="41"/>
         <source>Public Information</source>
         <translation>Informazioni Pubbliche</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="26"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="47"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="36"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="57"/>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="49"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="70"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="55"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="76"/>
         <source>Your Tox ID (click to copy)</source>
         <translation>(clicca qui per copiare)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="65"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="86"/>
         <source>Profiles</source>
         <translation>Profili</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="73"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="94"/>
         <source>Available profiles:</source>
         <translation>Profili disponibili:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="94"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="115"/>
         <source>Load</source>
         <comment>load profile button</comment>
         <translation>Carica</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="101"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="122"/>
         <source>Rename</source>
         <comment>rename profile button</comment>
         <translation>Rinomina</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="108"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="129"/>
         <source>Export</source>
         <comment>export profile button</comment>
         <translation>Esporta</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="115"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="139"/>
         <source>Delete</source>
         <comment>delete profile button</comment>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="118"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="136"/>
         <source>This is useful to remain safe on public computers</source>
         <comment>delete profile button tooltip</comment>
         <translation>Utile per preservare la tua sicurezza su computer pubblici</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="129"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="150"/>
         <source>Import a profile</source>
         <comment>import profile button</comment>
         <translation>Importa profilo</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identitysettings.ui" line="136"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="157"/>
         <source>New Tox ID</source>
         <comment>new profile button</comment>
         <translation>Nuovo profilo</translation>
     </message>
 </context>
+<context>
+    <name>InputPasswordDialog</name>
+    <message>
+        <location filename="../src/widget/form/inputpassworddialog.ui" line="14"/>
+        <source>Password Dialog</source>
+        <translation>Password richiesta</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/inputpassworddialog.ui" line="23"/>
+        <source>Input password:</source>
+        <translation>Password:</translation>
+    </message>
+</context>
+<context>
+    <name>LoadHistoryDialog</name>
+    <message>
+        <location filename="../src/widget/form/loadhistorydialog.ui" line="14"/>
+        <source>Load History Dialog</source>
+        <translation>Carica log</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/loadhistorydialog.ui" line="23"/>
+        <source>Load history from:</source>
+        <translation>Carica log dal giorno:</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -756,136 +901,199 @@ Do you want to erase this profile ?</source>
 <context>
     <name>PrivacyForm</name>
     <message>
-        <location filename="../src/widget/form/settings/privacyform.cpp" line="21"/>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="28"/>
         <source>Privacy</source>
         <translation>Privacy</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="88"/>
+        <source>Encrypted log</source>
+        <translation>Log criptato</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="89"/>
+        <source>You already have history log file encrypted with different password
+Do you want to delete old history file?</source>
+        <translation>Hai già un file di log criptato con una password diversa.
+Vuoi eliminare il vecchio file?</translation>
+    </message>
+</context>
+<context>
+    <name>PrivacySettings</name>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="23"/>
+        <source>Typing Notification</source>
+        <translation>Notifica quando qualcuno sta scrivendo</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="33"/>
+        <source>Keep History (unstable)</source>
+        <translation>Salva log delle chat (unstable)</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="43"/>
+        <source>Encryption</source>
+        <translation>Crittografiia</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="52"/>
+        <source>Encrypt Tox datafile</source>
+        <translation>Cripta Tox datafile</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/privacysettings.ui" line="62"/>
+        <source>Encrypt History</source>
+        <translation>Cripta log delle chat</translation>
+    </message>
+</context>
+<context>
+    <name>SetPasswordDialog</name>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Inserisci password</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="23"/>
+        <source>Type Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/setpassworddialog.ui" line="37"/>
+        <source>Repeat Password</source>
+        <translation>Ripeti password</translation>
+    </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../src/widget/widget.cpp" line="75"/>
+        <location filename="../src/widget/widget.cpp" line="74"/>
         <source>online</source>
         <translation>online</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="78"/>
+        <location filename="../src/widget/widget.cpp" line="77"/>
         <source>away</source>
         <translation>assente</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="81"/>
+        <location filename="../src/widget/widget.cpp" line="80"/>
         <source>busy</source>
         <translation>occupato</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="84"/>
+        <location filename="../src/widget/widget.cpp" line="83"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="87"/>
+        <location filename="../src/widget/widget.cpp" line="86"/>
         <source>Change status to:</source>
         <translation>Cambia stato in:</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="154"/>
+        <location filename="../src/widget/widget.cpp" line="153"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="156"/>
+        <location filename="../src/widget/widget.cpp" line="155"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Assente</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="158"/>
+        <location filename="../src/widget/widget.cpp" line="157"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupato</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="382"/>
+        <location filename="../src/widget/widget.cpp" line="383"/>
         <source>Choose a profile</source>
         <translation>Scegli un profilo</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="383"/>
+        <location filename="../src/widget/widget.cpp" line="384"/>
         <source>Please choose which identity to use</source>
         <translation>Per favore scegli quale identità usare</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="409"/>
+        <location filename="../src/widget/widget.cpp" line="410"/>
         <source>Choose a profile picture</source>
         <translation>Scegli un&apos;immagine per il profilo</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="416"/>
-        <location filename="../src/widget/widget.cpp" line="423"/>
-        <location filename="../src/widget/widget.cpp" line="444"/>
+        <location filename="../src/widget/widget.cpp" line="417"/>
+        <location filename="../src/widget/widget.cpp" line="424"/>
+        <location filename="../src/widget/widget.cpp" line="445"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="416"/>
+        <location filename="../src/widget/widget.cpp" line="417"/>
         <source>Unable to open this file</source>
         <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="423"/>
+        <location filename="../src/widget/widget.cpp" line="424"/>
         <source>Unable to read this image</source>
         <translation>Impossibile leggere l&apos;immagine</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="444"/>
+        <location filename="../src/widget/widget.cpp" line="445"/>
         <source>This image is too big</source>
         <translation>L&apos;immagine è troppo grande</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="471"/>
+        <location filename="../src/widget/widget.cpp" line="472"/>
         <source>Toxcore failed to start, the application will terminate after you close this message.</source>
         <translation>Impossibile avviare Toxcore.\nqTox terminerà dopo che avrai chiuso questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="480"/>
+        <location filename="../src/widget/widget.cpp" line="481"/>
         <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
         <comment>popup text</comment>
         <translation>Impossibile avviare Toxcore con le tue impostazione proxy.\nqTox non può funzionare correttamente, per favore modifica le impostazioni e riavvia il programma.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="660"/>
+        <location filename="../src/widget/widget.cpp" line="661"/>
         <source>away</source>
         <comment>contact status</comment>
         <translation>assente</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="662"/>
+        <location filename="../src/widget/widget.cpp" line="663"/>
         <source>busy</source>
         <comment>contact status</comment>
         <translation>occupato</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="664"/>
+        <location filename="../src/widget/widget.cpp" line="665"/>
         <source>offline</source>
         <comment>contact status</comment>
         <translation>offline</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="666"/>
+        <location filename="../src/widget/widget.cpp" line="667"/>
         <source>online</source>
         <comment>contact status</comment>
         <translation>online</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="668"/>
+        <location filename="../src/widget/widget.cpp" line="669"/>
         <source>%1 is now %2</source>
         <comment>e.g. &quot;Dubslow is now online&quot;</comment>
         <translation>%1 è ora %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="866"/>
+        <location filename="../src/widget/widget.cpp" line="873"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Sconosciuto&gt;</translation>