Index: program/localization/en_US/labels.inc
===================================================================
--- program/localization/en_US/labels.inc	(revision 29aab5a214620621057bfb6ef3546fa55b451f22)
+++ program/localization/en_US/labels.inc	(revision 61938a735e33627827351662c987afaf2dc1ae5d)
@@ -128,12 +128,8 @@
 $labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'Print this message';
-$labels['previousmessage']  = 'Show the previous message';
-$labels['previousmessages'] = 'Show previous set of messages';
-$labels['firstmessage']     = 'Show the first message';
-$labels['firstmessages']    = 'Show first set of messages';
-$labels['nextmessage']      = 'Show the next message';
-$labels['nextmessages']     = 'Show next set of messages';
-$labels['lastmessage']      = 'Show the last message';
-$labels['lastmessages']     = 'Show last set of messages';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
 $labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Show source';
@@ -312,8 +308,8 @@
 $labels['groupactions']   = 'Actions for contact groups...';
 
-$labels['previouspage']   = 'Show previous set';
-$labels['firstpage']      = 'Show first set';
-$labels['nextpage']       = 'Show next set';
-$labels['lastpage']       = 'Show last set';
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
 
 $labels['group'] = 'Group';
Index: program/localization/pl_PL/labels.inc
===================================================================
--- program/localization/pl_PL/labels.inc	(revision f5e7b353079f182d6d57e05b37e1eeb32872bc1a)
+++ program/localization/pl_PL/labels.inc	(revision 61938a735e33627827351662c987afaf2dc1ae5d)
@@ -112,16 +112,8 @@
 $labels['movemessagetotrash'] = 'Przenieś do Kosza';
 $labels['printmessage'] = 'Drukuj';
-$labels['previousmessage'] = 'PokaÅŒ poprzedniÄ
-';
-$labels['previousmessages'] = 'PokaŌ poprzednie';
-$labels['firstmessage'] = 'PokaÅŒ pierwszÄ
-';
-$labels['firstmessages'] = 'PokaŌ pierwsze';
-$labels['nextmessage'] = 'PokaÅŒ następnÄ
-';
-$labels['nextmessages'] = 'PokaÅŒ następne';
-$labels['lastmessage'] = 'PokaÅŒ ostatniÄ
-';
-$labels['lastmessages'] = 'PokaŌ ostatnie';
+$labels['previousmessage'] = 'Poprzednia wiadomość';
+$labels['firstmessage'] = 'Pierwsza wiadomość';
+$labels['nextmessage'] = 'Następna wiadomość';
+$labels['lastmessage'] = 'Ostatnia wiadomość';
 $labels['backtolist'] = 'PokaÅŒ listę wiadomości';
 $labels['viewsource'] = 'PokaÅŒ źródło';
@@ -243,8 +235,8 @@
  grupę';
 $labels['groupactions'] = 'Działania na grupach...';
-$labels['previouspage'] = 'poprzednia strona';
-$labels['firstpage'] = 'pierwsza strona';
-$labels['nextpage'] = 'następna strona';
-$labels['lastpage'] = 'ostatnia strona';
+$labels['previouspage'] = 'Poprzednia strona';
+$labels['firstpage'] = 'Pierwsza strona';
+$labels['nextpage'] = 'Następna strona';
+$labels['lastpage'] = 'Ostatnia strona';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
Index: skins/default/templates/mail.html
===================================================================
--- skins/default/templates/mail.html	(revision 4438d667609406abd969872f262d6a11b0e28b72)
+++ skins/default/templates/mail.html	(revision 61938a735e33627827351662c987afaf2dc1ae5d)
@@ -82,9 +82,9 @@
     </div>
     <div id="countcontrols" class="pagenav">
-        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessages" content=" " />
-        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessages" content=" " />
+        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
+        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
         <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
-        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessages" content=" " />
-        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessages" content=" " />
+        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
+        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
     </div>
 </div>