Major code changes require translation changes ;-)

17 files changed, 1102 insertions, 400 deletions

diff --git a/i18n/da/mailit.ts b/i18n/da/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/da/mailit.ts
+++ b/i18n/da/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/mailit.ts b/i18n/de/mailit.ts
index 26649bd..17c802b 100644
--- a/i18n/de/mailit.ts
+++ b/i18n/de/mailit.ts
@@ -1,505 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>Angehängt</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>Dateiart</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>attach...</source>
-        <translation type="unfinished"></translation>
+        <translation>ahnhängen ...</translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>Account bearbeiten</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>Account erstellen</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>Accountname</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>Ihr Name</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>POP Benutzername</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>POP Passwort</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>POP Server</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>SMTP Server</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>Abgleichen</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>Mailgröße (kB)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>Untätig</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Accounts</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>Nachricht holen aus </translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>Account bearbeiten</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>Account löschen</translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation>Mail versenden</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>Erstellen</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>Eingang</translation>
     </message>
     <message>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>Ausgang</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>Kein Accounbt ausgewählt</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>Sie müssen einen Account erstellen ...</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Hauptkontrolleiste</translation>
     </message>
     <message>
         <source>getMail</source>
-        <translation type="unfinished"></translation>
+        <translation>Mail holen</translation>
     </message>
     <message>
         <source>select account</source>
-        <translation type="unfinished"></translation>
+        <translation>Zugang wählen</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie um Mail von allen verfügbaren Servern zu holen.
+Halten Sie den Stift um einen Server auszuwählen.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Löschen</translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>No account associated</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Zugang verknüpft</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist kein aktiver Zugang mit 
+dieser Mail verknüpft so dass sie
+nicht heruntergeladen werden kann</translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>Es konnten nicht alle Dateien
 der Mail gefunden werden mit dem Betreff: </translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>Die Mail wurde *nicht* gesendet</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>Attachementfehler</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>Mail schreiben</translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation>Mail prüfen</translation>
     </message>
     <message>
         <source>Central view area</source>
-        <translation type="unfinished"></translation>
+        <translation>Zentrale Mailansicht</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Mail nicht heruntergeladen</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Die gewählte Nachricht wurde
+nocht nicht heruntergeladen.
+Möchten Sie dies jetzt durchführen ?</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>Verbindung hergestellt</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>Fehler aufgetreten</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>Hole Mail</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>Nachricht vervollständigen</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>Keine neuen Nachrichten</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>Neue Nachrchten</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>Keine neuen Nachrichten</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Betreffzeile sollte hier eingegeben werden</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfänger werden hier eingegeben</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie Kopien versenden möchten können Sie dies hier angeben</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Schalter öffnet das Adressbuch mit allen Mailadressen Ihres OPIE Addressbuchs</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chose the recipients from this list</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie hier Ihren Text ein</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiermit stellen Sie Ihre Nachricht in die Warteschlange</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies ist eine Übersicht aller Nachrichtenanhänge</translation>
+    </message>
+    <message>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
+        <translation>Dies ist der Posteingang.
+Er enthält Ihre empfangenen Nachrichten
+die durch Doppelklicken gelesen werden 
+können. Ein blaues Symbol weist Sie auf Anhänge hin.</translation>
+    </message>
+    <message>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
+        <translation>Dies ist der Postausgang.
+Er enthält alle wartenden Nachrichten die
+durch Doppelklicken gelesen werden 
+können.</translation>
+    </message>
+    <message>
+        <source>Choose the recipients from this list</source>
+        <translation>Wählen Sie die Empfänger aus dieser Liste</translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
-        <translation>&amp;Ansehen</translation>
+        <translation>&amp;Ansicht</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation>Antworten</translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Nächste</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>Attachments</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>Textformat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiterleiten</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um die Nachricht weiterzuleiten</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesen der vorhergehenden Nachricht der Liste</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesen dernächsten Nachricht der Liste</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um Anhänge hinzuzufügen</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Mailansicht hat 2 Modi:
+&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; zeigt die Nachricht als HTMLmit sogenannten &quot;Rich Features&quot; an (ohne Zeilenumbrüche durch bspw. CRLF).
+&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt;  zeigt die Nachricht als reinen Text an&lt;/LI&gt;
+Klicken Sie hier um zwischen beiden Modi umzusachalten</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um die gewählte Nachricht zu löschen</translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation>Herunterladen</translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation>Klicken Sie hier um die Mail vom Server
+zu vervolständigen.</translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation>antworten</translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation>auf die Nachricht antworten</translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation>Klicken Sie hier um auf die Nachricht zu antworten.
+Halten Sie den Stift gedrückt für weitere Optionen.</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation>An alle antworten</translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation>Klicken Sie hier um allen Emfängern zu</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>DNS-Auflösung</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Verbindung hergestellt</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>Sende: </translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>Gesendet</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>Nachrichten</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>Installieren</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um den Anhang zu Ihren Dokumenten z u installieren</translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>Mail queuen</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>Neue Mail</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>An: </translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>Kopie: </translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>Betreff: </translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um Dateien zu Ihrer Nachricht hinzuzufügen</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Schalter stellt Ihre Nachricht in die Warteschlange</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie hier um eine Nachricht zu erstellen</translation>
     </message>
     <message>
         <source>No recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Empfänger</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht senden an ?</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished">OK
+        <translation>OK
 </translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiges Empfängertrennzeichen</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfänger sollten durch ;
+getrennt werden und müssen gültige
+Adressen sein</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiges Trennzeichen der Kopieempfänger</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieempfänger sollten durch ;
+getrennt werden und müssen gültige
+Adressen sein</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation type="unfinished"></translation>
+        <translation>Re:</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
+        <translation>======weitergeleitete Nachricht von </translation>
     </message>
     <message>
         <source> starts======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>beginnt======
+
+</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation type="unfinished"></translation>
+        <translation>FWD:</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>======Ende der weitergeleiteten Nachricht======</translation>
+    </message>
+    <message>
+        <source> wrote on </source>
+        <translation>schrieb am </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/mailit.ts b/i18n/en/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/en/mailit.ts
+++ b/i18n/en/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mailit.ts b/i18n/es/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/es/mailit.ts
+++ b/i18n/es/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/mailit.ts b/i18n/fr/mailit.ts
index e980a1f..95aa208 100644
--- a/i18n/fr/mailit.ts
+++ b/i18n/fr/mailit.ts
@@ -158,349 +158,378 @@ créer un compte !</translation>
         <translation type="unfinished">Supprimer</translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>Impossible de trouver tous 
 les fichiers du message intitulé :</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>Le message n&apos;a pas été envoyé</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>Erreur de pièce jointe</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation>Lire un message</translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>Connection établie</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>Une erreur s&apos;est produite</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>Réception en cours</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>Fin du transfert en cours</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>Pas de nouveau message</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>nouveaux messages</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>Pas de nouveaux messages</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Message</translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation>Répondre</translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>Pièces jointes</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>Format de texte</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>Recherche du DNS</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Connection établie</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>Envoyer :</translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>Envoyé(s)</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>messages</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>Installer</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Message</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>Mettre en file d&apos;attente</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>Nouveau message</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A :</translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>Cc :</translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>Sujet :</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished">OK
 </translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/mailit.ts b/i18n/hu/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/hu/mailit.ts
+++ b/i18n/hu/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/mailit.ts b/i18n/it/mailit.ts
index 38055a8..68eb895 100644
--- a/i18n/it/mailit.ts
+++ b/i18n/it/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/mailit.ts b/i18n/ja/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/ja/mailit.ts
+++ b/i18n/ja/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/mailit.ts b/i18n/ko/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/ko/mailit.ts
+++ b/i18n/ko/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/mailit.ts b/i18n/no/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/no/mailit.ts
+++ b/i18n/no/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/mailit.ts b/i18n/pl/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/pl/mailit.ts
+++ b/i18n/pl/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/mailit.ts b/i18n/pt/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/pt/mailit.ts
+++ b/i18n/pt/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mailit.ts b/i18n/pt_BR/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/pt_BR/mailit.ts
+++ b/i18n/pt_BR/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/mailit.ts b/i18n/sl/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/sl/mailit.ts
+++ b/i18n/sl/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/mailit.ts b/i18n/xx/mailit.ts
index 87d132c..7d0b588 100644
--- a/i18n/xx/mailit.ts
+++ b/i18n/xx/mailit.ts
@@ -1,315 +1,531 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Attatch...</source>
+        <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
+        <source>attach...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Get all mail</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Send mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>From</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Main operation toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>select account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to download mail via all available accounts.
+ Press and hold to select the desired account.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>No account associated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is no active account 
+associated to this mail
+ it can not be downloaded</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Central view area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail not downloaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail you have clicked 
+has not been downloaded yet.
+ Would you like to do it now ?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Previous message </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Completing message </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail subject should be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recipients can be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you would like to send copies of your mail they can be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your mail text here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the recipients from this list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Queue your mail by clicking here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an overview about all attachments in the mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read the previous mail in the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read the next mail in the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add attachments to your mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail view has 2 modes:
+&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to forward the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Click here to install the attachment to your Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Attatchment</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Enque mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to attach files to your mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button puts your mail in the send queue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send mail to whom?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Incorrect recipient separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recipients must be separated by ;
+and be valid emailaddresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect carbon copy separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CC Recipients must be separated by ;
+and be valid emailaddresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>======forwarded message from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> starts======
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FWD: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>======end of forwarded message======
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/mailit.ts b/i18n/zh_CN/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/zh_CN/mailit.ts
+++ b/i18n/zh_CN/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mailit.ts b/i18n/zh_TW/mailit.ts
index d3ef2f3..d61ee1d 100644
--- a/i18n/zh_TW/mailit.ts
+++ b/i18n/zh_TW/mailit.ts
@@ -155,348 +155,377 @@
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Examine mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>This is the inbox view.
- It keeps the fetched mail which can be viewed by double clicking the entry.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>A blue attachment icon shows whether this mail has attachments.</source>
+        <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is the oubox view.
- It keeps the queued mails to send which can be reviewed by double clicking the entry.</source>
+        <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The mail subject should be entered here</source>
+        <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Recipients can be entered here</source>
+        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
+        <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
+        <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter your mail text here</source>
+        <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chose the recipients from this list</source>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Queue your mail by clicking here</source>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is an overview about all attachments in the mail</source>
+        <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to reply to the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>