diff --git a/translations/nl.ts b/translations/nl.ts
index f63c9d0f0..082c4e25c 100644
--- a/translations/nl.ts
+++ b/translations/nl.ts
@@ -293,78 +293,99 @@ Proxy omzeilen en een directe internetverbinding gebruiken?</translation>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="83"/>
+        <location filename="../src/widget/form/chatform.cpp" line="78"/>
         <source>Load chat history...</source>
         <translation>Laad chatgeschiedenis...</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="181"/>
+        <location filename="../src/widget/form/chatform.cpp" line="177"/>
         <source>Send a file</source>
         <translation>Verstuur een bestand</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="189"/>
-        <location filename="../src/widget/form/chatform.cpp" line="760"/>
+        <location filename="../src/widget/form/chatform.cpp" line="185"/>
+        <location filename="../src/widget/form/chatform.cpp" line="729"/>
         <source>File not read</source>
         <translation>Bestand niet gelezen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="189"/>
-        <location filename="../src/widget/form/chatform.cpp" line="760"/>
+        <location filename="../src/widget/form/chatform.cpp" line="185"/>
+        <location filename="../src/widget/form/chatform.cpp" line="729"/>
         <source>qTox wasn&apos;t able to open %1</source>
         <translation>qTox kan %1 niet openen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="194"/>
-        <location filename="../src/widget/form/chatform.cpp" line="765"/>
+        <location filename="../src/widget/form/chatform.cpp" line="190"/>
+        <location filename="../src/widget/form/chatform.cpp" line="734"/>
         <source>Bad Idea</source>
         <translation>Slecht idee</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="194"/>
-        <location filename="../src/widget/form/chatform.cpp" line="765"/>
+        <location filename="../src/widget/form/chatform.cpp" line="190"/>
+        <location filename="../src/widget/form/chatform.cpp" line="734"/>
         <source>You&apos;re trying to send a special (sequential) file, that&apos;s not going to work!</source>
         <translation>Je probeert een speciaal (sequentieel) bestand te versturen, dat zal niet werken!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="312"/>
+        <location filename="../src/widget/form/chatform.cpp" line="293"/>
+        <source>%1 calling</source>
+        <translation>%1 belt</translation>
+    </message>
+    <message>
         <source>%1 is calling</source>
-        <translation>%1 belt je</translation>
+        <translation type="obsolete">%1 belt je</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="374"/>
+        <location filename="../src/widget/form/chatform.cpp" line="355"/>
         <source>%1 stopped calling</source>
         <translation>%1 heeft opgelegd</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="423"/>
+        <location filename="../src/widget/form/chatform.cpp" line="404"/>
         <source>Calling to %1</source>
         <translation>%1 bellen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="516"/>
+        <location filename="../src/widget/form/chatform.cpp" line="497"/>
         <source>Call rejected</source>
         <translation>Gesprek geweigerd</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="732"/>
+        <location filename="../src/widget/form/chatform.cpp" line="701"/>
         <source>Failed to send file &quot;%1&quot;</source>
         <translation>Kon bestand %1 niet verzenden</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="880"/>
+        <location filename="../src/widget/form/chatform.cpp" line="865"/>
         <source>Call with %1 ended. %2</source>
         <translation>Gesprek met %1 beëindigd. %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="900"/>
+        <location filename="../src/widget/form/chatform.cpp" line="884"/>
         <source>Call duration: </source>
         <translation>Gesprekstijd: </translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="923"/>
         <source>is typing...</source>
-        <translation>is aan het typen...</translation>
+        <translation type="obsolete">is aan het typen...</translation>
+    </message>
+</context>
+<context>
+    <name>ChatLog</name>
+    <message>
+        <location filename="../src/chatlog/chatlog.cpp" line="66"/>
+        <source>Copy</source>
+        <translation>Kopieëren</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/chatlog.cpp" line="81"/>
+        <source>Select all</source>
+        <translation>Alles selecteren</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/chatlog.cpp" line="501"/>
+        <source>pending</source>
+        <translation>wachtend</translation>
     </message>
 </context>
 <context>
@@ -388,17 +409,17 @@ Proxy omzeilen en een directe internetverbinding gebruiken?</translation>
         <translation>qTox gebruiker</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="763"/>
+        <location filename="../src/core.cpp" line="762"/>
         <source>Friend is already added</source>
         <translation>Vriend is al toegevoegd</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="779"/>
+        <location filename="../src/core.cpp" line="778"/>
         <source>/me offers friendship.</source>
         <translation>/me bied vriendschap aan.</translation>
     </message>
     <message>
-        <location filename="../src/core.cpp" line="781"/>
+        <location filename="../src/core.cpp" line="780"/>
         <source>/me offers friendship, &quot;%1&quot;</source>
         <translation>/me bied vriendschap aap, &quot;%1&quot;</translation>
     </message>
@@ -489,28 +510,93 @@ Het uitschakelen van de chatgeschiedenis zal de versleutelde geschiedenis beware
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="239"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Sla een bestand op</translation>
+        <translation type="obsolete">Sla een bestand op</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="248"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation>Locatie niet schrijfbaar</translation>
+        <translation type="obsolete">Locatie niet schrijfbaar</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="249"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation>Je hebt geen toepassing om een bestand op deze locatie op te slaan. Kies een andere locatie of annuleer het opslaan.</translation>
+        <translation type="obsolete">Je hebt geen toepassing om een bestand op deze locatie op te slaan. Kies een andere locatie of annuleer het opslaan.</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="425"/>
         <source>ETA</source>
         <translatorcomment>NOTE: I couldn&apos;t think of a short Dutch word for this. Do we have one?</translatorcomment>
-        <translation>ETA</translation>
+        <translation type="obsolete">ETA</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferWidget</name>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="148"/>
+        <source>10Mb</source>
+        <translation>10Mb</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="164"/>
+        <source>0kb/s</source>
+        <translation>0kb/s</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="180"/>
+        <source>ETA:10:10</source>
+        <translation>ETA:10:10</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="224"/>
+        <source>Filename</source>
+        <translation>Bestandsnaam</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.ui" line="299"/>
+        <source>[preview]</source>
+        <translation>[voorbeeld]</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="81"/>
+        <source>Waiting to send...</source>
+        <comment>file transfer widget</comment>
+        <translation>Wachten op gesprekspartner...</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="84"/>
+        <source>Accept to receive this file</source>
+        <comment>file transfer widget</comment>
+        <translation>Accepteer om dit bestand te ontvangen</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="126"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation>Locatie niet schrijfbaar</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="127"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation>Je hebt geen toepassing om een bestand op deze locatie op te slaan. Kies een andere locatie of annuleer het opslaan.</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="299"/>
+        <source>paused</source>
+        <comment>file transfer widget</comment>
+        <translation>gepauzeerd</translation>
+    </message>
+    <message>
+        <location filename="../src/chatlog/content/filetransferwidget.cpp" line="421"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation>Sla een bestand op</translation>
     </message>
 </context>
 <context>
@@ -571,47 +657,47 @@ Het uitschakelen van de chatgeschiedenis zal de versleutelde geschiedenis beware
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="55"/>
+        <location filename="../src/widget/friendwidget.cpp" line="56"/>
         <source>Invite to group</source>
         <comment>Menu to invite a friend to a groupchat</comment>
         <translation>Stuur uitnodiging voor groep</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="56"/>
+        <location filename="../src/widget/friendwidget.cpp" line="57"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Kopieer vriend ID</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="68"/>
+        <location filename="../src/widget/friendwidget.cpp" line="69"/>
         <source>Set alias...</source>
         <translation>Stel alias in...</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="71"/>
+        <location filename="../src/widget/friendwidget.cpp" line="72"/>
         <source>Auto accept files from this friend</source>
         <comment>context menu entry</comment>
         <translation>Accepteer bestandsoverdrachten van deze vriend automatisch</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="76"/>
+        <location filename="../src/widget/friendwidget.cpp" line="77"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Verwijder vriend</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="109"/>
+        <location filename="../src/widget/friendwidget.cpp" line="110"/>
         <source>Choose an auto accept directory</source>
         <comment>popup title</comment>
         <translation>Kies een locatie om automatisch geaccepteerde bestanden op te slaan</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="238"/>
+        <location filename="../src/widget/friendwidget.cpp" line="249"/>
         <source>User alias</source>
         <translation>Gebruikersalias</translation>
     </message>
     <message>
-        <location filename="../src/widget/friendwidget.cpp" line="238"/>
+        <location filename="../src/widget/friendwidget.cpp" line="249"/>
         <source>You can also set this by clicking the chat form name.
 Alias:</source>
         <translation>Je kan dit ook instellen door op de naam in het chatvenster te klikken.
@@ -750,9 +836,8 @@ in plaats van naar de taakbalk.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Start qTox als het besturingssysteem op start (met het huidige profiel).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="199"/>
         <source>Start automatically</source>
-        <translation>Start automatisch</translation>
+        <translation type="obsolete">Start automatisch</translation>
     </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="206"/>
@@ -782,81 +867,80 @@ in plaats van naar de taakbalk.</translation>
         <translation>Accepteer bestanden automatisch</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="249"/>
         <source>PushButton</source>
         <translatorcomment>NOTE: Does it even make sense to translate this?</translatorcomment>
-        <translation>DrukKnop</translation>
+        <translation type="obsolete">DrukKnop</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="262"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="259"/>
         <source>Set to 0 to disable</source>
         <translation>Zet naar 0 om uit te schakelen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="268"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="265"/>
         <source> minutes</source>
         <translation> minuten</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="281"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="278"/>
         <source>Your status is changed to Away after set period of inactivity.</source>
         <translation>Je status zal automatisch naar afwezig gezet worden na een bepaalde periode van inactiviteit.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="287"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="284"/>
         <source>Auto away after (0 to disable):</source>
         <translation>Automatisch afwezig na (0 om uit te schakelen):</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="299"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="296"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="305"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="302"/>
         <source>Always notify about new messages in groupchats.</source>
         <comment>toolTip for Group chat always notify</comment>
         <translation>Stuur altijd een notificatie voor nieuwe berichten in een groepsgesprek.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="308"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="305"/>
         <source>Group chats always notify</source>
         <translation>Notificatie voor alle berichten in een groepsgesprek</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="315"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="312"/>
         <source>Show contacts&apos; status changes</source>
         <translation>Laat statusverandering van contacten zien</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="322"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="319"/>
         <source>On new message:</source>
         <translation>Bij een nieuw bericht:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="334"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="331"/>
         <source>Show qTox&apos;s window when you receive new message.</source>
         <comment>tooltip for Show window setting</comment>
         <translation>Laat qTox&apos; venster zijn bij het ontvangen van een nieuw bericht.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="337"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="334"/>
         <source>Show window</source>
         <translation>Laat venster zien</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="344"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="341"/>
         <source>Focus qTox when you receive message.</source>
         <comment>toolTip for Focus window setting</comment>
         <translation>Focus qTox&apos; venster zijn bij het ontvangen van een nieuw bericht.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="347"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="344"/>
         <source>Focus window</source>
         <translation>Focus venster</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="369"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="366"/>
         <source>Messages you are trying to send to your friends when they are not online
 will be sent to them when they will appear online to you.</source>
         <comment>toolTip for Faux offline messaging setting</comment>
@@ -864,121 +948,131 @@ will be sent to them when they will appear online to you.</source>
 zullen naar ze verstuurd worden zodra deze online komen.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="373"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="370"/>
         <source>Faux offline messaging</source>
         <translation>Faux offline berichten</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="380"/>
         <source>Your contact list will be shown in compact mode.
 qTox&apos;s restart needed.</source>
         <comment>toolTip for compact layout setting</comment>
-        <translation>De vriendenlist zal in compacte modus getoond worden.
+        <translation type="obsolete">De vriendenlist zal in compacte modus getoond worden.
 qTox herstart benodigd.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="384"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="199"/>
+        <source>Autostart</source>
+        <translation>Automatisch starten</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="377"/>
+        <source>Your contact list will be shown in compact mode.</source>
+        <comment>toolTip for compact layout setting</comment>
+        <translation>Je contactlijst zal in een compacte modus getoond worden.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="380"/>
         <source>Compact contact list</source>
         <translation>Compacte vriendenlijst</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="400"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="396"/>
         <source>Theme</source>
         <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="406"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="402"/>
         <source>Use emoticons</source>
         <translation>Gebruik emoticons</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="424"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="420"/>
         <source>Smiley Pack:</source>
         <extracomment>Text on smiley pack label</extracomment>
         <translation>Smiley pakket:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="498"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="494"/>
         <source>Emoticon size:</source>
         <translation>Emoticon grootte:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="514"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="510"/>
         <source> px</source>
         <translation> px</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="530"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="526"/>
         <source>Style:</source>
         <translation>Stijl:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="547"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="543"/>
         <source>Theme color:</source>
         <translation>Themakleur:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="564"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="560"/>
         <source>Timestamp format:</source>
         <translation>Tijdsaanduiding:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="586"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="582"/>
         <source>Connection Settings</source>
         <translation>Verbindingsinstellingen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="600"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="596"/>
         <source>Disabling this allows, e.g., toxing over Tor. It adds load to the Tox network however, so uncheck only when necessary.</source>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>Door dit uit te schakelen kun je bijvoorbeeld Tox via Tor gebruiken. Het is wel zwaarder voor het Tox netwerk, dus schakeld dit alleen uit indeen noodzakelijk.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="603"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="599"/>
         <source>Enable UDP (recommended)</source>
         <extracomment>Text on checkbox to disable UDP</extracomment>
         <translation>Gebruik UDP (aanbevolen)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="610"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="606"/>
         <source>Enable IPv6 (recommended)</source>
         <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Gebruik IPv6 (aanbevolen)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="644"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="640"/>
         <source>Proxy type:</source>
         <translation>Proxy type:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="651"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="647"/>
         <source>Address:</source>
         <extracomment>Text on proxy addr label</extracomment>
         <translation>Adres:</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="661"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="657"/>
         <source>Port</source>
         <extracomment>Text on proxy port label</extracomment>
         <translation>Poort</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="675"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="671"/>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="680"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="676"/>
         <source>SOCKS5</source>
         <translation>SOCKS5</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="685"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="681"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/generalsettings.ui" line="695"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="691"/>
         <source>Reconnect</source>
         <comment>reconnect button</comment>
         <translation>Opnieuw verbinden</translation>
@@ -987,53 +1081,58 @@ qTox herstart benodigd.</translation>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="71"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="73"/>
         <source>Send message</source>
         <translation>Verstuur bericht</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="73"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="75"/>
         <source>Smileys</source>
         <translation>Smileys</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="77"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="79"/>
         <source>Send file(s)</source>
         <translation>Verstuur bestand(en)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="80"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="82"/>
         <source>Audio call: RED means you&apos;re on a call</source>
         <translation>Audio gesprek: ROOD betekend in gesprek</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="83"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="85"/>
         <source>Video call: RED means you&apos;re on a call</source>
         <translation>Video gesprek: ROOD betekend in gesprek</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="86"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="88"/>
         <source>Toggle speakers volume: RED is OFF</source>
         <translation>Schakel speakers in of uit: ROOD is UIT</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="89"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="91"/>
         <source>Toggle microphone: RED is OFF</source>
         <translation>Schakel microfoon in of uit: ROOD is UIT</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="161"/>
-        <location filename="../src/widget/form/genericchatform.cpp" line="204"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="165"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="282"/>
         <source>Save chat log</source>
         <translation>Sla chatgeschiedenis op</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="162"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="166"/>
         <source>Clear displayed messages</source>
         <translation>Verwijder getoonde berichten</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/genericchatform.cpp" line="309"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="298"/>
+        <source>Not sent</source>
+        <translation>Niet verstuurd</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/genericchatform.cpp" line="331"/>
         <source>Cleared</source>
         <translatorcomment>FIXME: Weird translation</translatorcomment>
         <translation>Geleegd</translation>
@@ -1406,6 +1505,15 @@ Dit bestand bevat geen chatgeschiedenis.</translation>
         <translation>Tox video</translation>
     </message>
 </context>
+<context>
+    <name>Nexus</name>
+    <message>
+        <location filename="../src/nexus.cpp" line="164"/>
+        <source>Images (%1)</source>
+        <comment>filetype filter</comment>
+        <translation>Afbeeldingen (%1)</translation>
+    </message>
+</context>
 <context>
     <name>PrivacyForm</name>
     <message>
@@ -1579,10 +1687,9 @@ Wanneer je nospam veranderd, kunnen huidige vrienden nog met je communiceren,
 maar nieuwe vrienden zullen je nieuwe Tox ID moeten wete om te toe te kunnen voegen.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/privacysettings.ui" line="149"/>
         <source>HHHHHHHH</source>
         <translatorcomment>Note: WHAT?!</translatorcomment>
-        <translation>HHHHHHHH</translation>
+        <translation type="obsolete">HHHHHHHH</translation>
     </message>
     <message>
         <location filename="../src/widget/form/settings/privacysettings.ui" line="156"/>
@@ -1690,6 +1797,11 @@ Deze zal geïnstalleerd worden wanneer qTox herstart.</translation>
         <comment>Default message in Tox URI friend requests. Write something appropriate!</comment>
         <translation>Tox met me!</translation>
     </message>
+    <message>
+        <location filename="../src/chatlog/chatmessage.cpp" line="126"/>
+        <source>Busy...</source>
+        <translation>Bezig...</translation>
+    </message>
 </context>
 <context>
     <name>SetPasswordDialog</name>
@@ -1836,130 +1948,142 @@ Indien onzeker, druk op &quot;Nee&quot;, zo dat er geen onveilig verzoek naar de
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../src/widget/widget.cpp" line="100"/>
+        <location filename="../src/widget/widget.cpp" line="105"/>
         <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="103"/>
+        <location filename="../src/widget/widget.cpp" line="108"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Afwezig</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="106"/>
+        <location filename="../src/widget/widget.cpp" line="111"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Bezet</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="116"/>
+        <location filename="../src/widget/widget.cpp" line="121"/>
         <source>&amp;Quit</source>
         <translatorcomment>NOTE: Can this be safely translated like this?</translatorcomment>
         <translation>&amp;Sluit</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="347"/>
+        <location filename="../src/widget/widget.cpp" line="353"/>
         <source>Choose a profile picture</source>
         <translation>Kies een profielfoto</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="354"/>
-        <location filename="../src/widget/widget.cpp" line="361"/>
-        <location filename="../src/widget/widget.cpp" line="382"/>
+        <location filename="../src/widget/widget.cpp" line="362"/>
+        <location filename="../src/widget/widget.cpp" line="369"/>
+        <location filename="../src/widget/widget.cpp" line="390"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="354"/>
+        <location filename="../src/widget/widget.cpp" line="362"/>
         <source>Unable to open this file</source>
         <translation>Kon dit bestand niet openen</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="361"/>
+        <location filename="../src/widget/widget.cpp" line="369"/>
         <source>Unable to read this image</source>
         <translation>Kon deze afbeelding niet lezen</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="382"/>
+        <location filename="../src/widget/widget.cpp" line="390"/>
         <source>This image is too big</source>
         <translation>Deze afbeelding is te groot</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="422"/>
+        <location filename="../src/widget/widget.cpp" line="430"/>
         <source>Toxcore failed to start, the application will terminate after you close this message.</source>
         <translation>Toxcore kon niet opstarten, de applicatie zal afsluiten nadat dit bericht wordt gesloten.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="431"/>
+        <location filename="../src/widget/widget.cpp" line="439"/>
         <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
         <comment>popup text</comment>
         <translation>Toxcore kon niet opstarten met deze proxyinstellingen. Hierdoor kan qTox niet starten. Verander je instellingen en herstart.</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="480"/>
+        <location filename="../src/widget/widget.cpp" line="488"/>
         <source>Add friend</source>
         <translation>Voeg vriend toe</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="492"/>
+        <location filename="../src/widget/widget.cpp" line="500"/>
         <source>File transfers</source>
         <translation>Bestandsoverdrachten</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="537"/>
+        <location filename="../src/widget/widget.cpp" line="545"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="649"/>
+        <location filename="../src/widget/widget.cpp" line="654"/>
         <source>Couldn&apos;t request friendship</source>
         <translation>Kon geen vriendschapsverzoek maken</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="677"/>
+        <location filename="../src/widget/widget.cpp" line="682"/>
         <source>away</source>
         <comment>contact status</comment>
         <translation>afwezig</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="679"/>
+        <location filename="../src/widget/widget.cpp" line="684"/>
         <source>busy</source>
         <comment>contact status</comment>
         <translation>bezet</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="681"/>
+        <location filename="../src/widget/widget.cpp" line="686"/>
         <source>offline</source>
         <comment>contact status</comment>
         <translation>offline</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="683"/>
+        <location filename="../src/widget/widget.cpp" line="688"/>
         <source>online</source>
         <comment>contact status</comment>
         <translation>online</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="686"/>
+        <location filename="../src/widget/widget.cpp" line="691"/>
         <source>%1 is now %2</source>
         <comment>e.g. &quot;Dubslow is now online&quot;</comment>
         <translation>%1 is nu %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="914"/>
+        <location filename="../src/widget/widget.cpp" line="867"/>
+        <source>Group invite</source>
+        <comment>popup title</comment>
+        <translation>Uitnodiging tot groepsgesprek</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="867"/>
+        <source>%1 has invited you to a groupchat. Would you like to join?</source>
+        <comment>popup text</comment>
+        <translation>%1 nodigd je uit tot een groepsgesprek. Wil je binnentreden?</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="922"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Onbekend&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="939"/>
+        <location filename="../src/widget/widget.cpp" line="948"/>
         <source>%1 has set the title to %2</source>
         <translation>%1 heeft de titel naar %2 gezet</translation>
     </message>
     <message>
-        <location filename="../src/widget/widget.cpp" line="1095"/>
+        <location filename="../src/widget/widget.cpp" line="1104"/>
         <source>Message failed to send</source>
         <translation>Bericht kon niet verstuurd worden</translation>
     </message>