@@ -53,7 +53,7 @@ protected void run(final Server server, final CommandSource sender, final String
 			{
 				if (cacheage > System.currentTimeMillis() - CACHETIME)
 				{
-					outputCache(sender, page);
+					outputCache(sender, commandLabel, page);
 					return;
 				}
 				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
@@ -65,20 +65,20 @@ protected void run(final Server server, final CommandSource sender, final String
 			{
 				lock.readLock().unlock();
 			}
-			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+			ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
 		}
 		else
 		{
 			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
 				sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
-			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+			ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
 		}
 
 	}
 
-	private static void outputCache(final CommandSource sender, int page)
+	private static void outputCache(final CommandSource sender, String command,  int page)
 	{
 		final Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(cacheage);
@@ -167,12 +167,14 @@ private class Viewer implements Runnable
 		private final transient CommandSource sender;
 		private final transient int page;
 		private final transient boolean force;
+		private final transient String commandLabel;
 
-		public Viewer(final CommandSource sender, final int page, final boolean force)
+		public Viewer(final CommandSource sender, final String commandLabel, final int page, final boolean force)
 		{
 			this.sender = sender;
 			this.page = page;
 			this.force = force;
+			this.commandLabel = commandLabel;
 		}
 
 		@Override
@@ -183,15 +185,15 @@ public void run()
 			{
 				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
 				{
-					outputCache(sender, page);
+					outputCache(sender, commandLabel, page);
 					return;
 				}
 			}
 			finally
 			{
 				lock.readLock().unlock();
 			}
-			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));
+			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, commandLabel, page, false), force));
 		}
 	}
 }
@@ -3,6 +3,10 @@
 import com.earth2me.essentials.CommandSource;
 import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.textreader.SimpleTextPager;
+import com.earth2me.essentials.textreader.TextPager;
 import com.earth2me.essentials.utils.FormatUtil;
 import com.earth2me.essentials.utils.StringUtil;
 import org.bukkit.Server;
@@ -34,10 +38,11 @@ public void run(final Server server, final User user, final String commandLabel,
 				user.sendMessage(tl("noMail"));
 				throw new NoChargeException();
 			}
-			for (String messages : mail)
-			{
-				user.sendMessage(messages);
-			}
+			
+			IText input = new SimpleTextInput(mail);
+			final TextPager pager = new TextPager(input);			
+			pager.showPage(args.length > 1 ? args[1] : null, null, commandLabel + " " + args[0], user.getSource());
+			
 			user.sendMessage(tl("mailClear"));
 			return;
 		}
 
@@ -26,6 +26,6 @@ public void run(final Server server, final CommandSource sender, final String co
 		final IText input = new TextInput(sender, "rules", true, ess);
 		final IText output = new KeywordReplacer(input, sender, ess);
 		final TextPager pager = new TextPager(output);
-		pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, "rules", sender);
+		pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, commandLabel, sender);
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected void run(final Server server, final CommandSource sender, final String`
`53`	`53`	`{`
`54`	`54`	`if (cacheage > System.currentTimeMillis() - CACHETIME)`
`55`	`55`	`{`
`56`		`- outputCache(sender, page);`
	`56`	`+ outputCache(sender, commandLabel, page);`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`	`if (ess.getUserMap().getUniqueUsers() > MINUSERS)`
`@@ -65,20 +65,20 @@ protected void run(final Server server, final CommandSource sender, final String`
`65`	`65`	`{`
`66`	`66`	`lock.readLock().unlock();`
`67`	`67`	`}`
`68`		`- ess.runTaskAsynchronously(new Viewer(sender, page, force));`
	`68`	`+ ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`	`72`	`if (ess.getUserMap().getUniqueUsers() > MINUSERS)`
`73`	`73`	`{`
`74`	`74`	`sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));`
`75`	`75`	`}`
`76`		`- ess.runTaskAsynchronously(new Viewer(sender, page, force));`
	`76`	`+ ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`}`
`80`	`80`
`81`		`- private static void outputCache(final CommandSource sender, int page)`
	`81`	`+ private static void outputCache(final CommandSource sender, String command, int page)`
`82`	`82`	`{`
`83`	`83`	`final Calendar cal = Calendar.getInstance();`
`84`	`84`	`cal.setTimeInMillis(cacheage);`
`@@ -167,12 +167,14 @@ private class Viewer implements Runnable`
`167`	`167`	`private final transient CommandSource sender;`
`168`	`168`	`private final transient int page;`
`169`	`169`	`private final transient boolean force;`
	`170`	`+ private final transient String commandLabel;`
`170`	`171`
`171`		`- public Viewer(final CommandSource sender, final int page, final boolean force)`
	`172`	`+ public Viewer(final CommandSource sender, final String commandLabel, final int page, final boolean force)`
`172`	`173`	`{`
`173`	`174`	`this.sender = sender;`
`174`	`175`	`this.page = page;`
`175`	`176`	`this.force = force;`
	`177`	`+ this.commandLabel = commandLabel;`
`176`	`178`	`}`
`177`	`179`
`178`	`180`	`@Override`
`@@ -183,15 +185,15 @@ public void run()`
`183`	`185`	`{`
`184`	`186`	`if (!force && cacheage > System.currentTimeMillis() - CACHETIME)`
`185`	`187`	`{`
`186`		`- outputCache(sender, page);`
	`188`	`+ outputCache(sender, commandLabel, page);`
`187`	`189`	`return;`
`188`	`190`	`}`
`189`	`191`	`}`
`190`	`192`	`finally`
`191`	`193`	`{`
`192`	`194`	`lock.readLock().unlock();`
`193`	`195`	`}`
`194`		`- ess.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));`
	`196`	`+ ess.runTaskAsynchronously(new Calculator(new Viewer(sender, commandLabel, page, false), force));`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public void run(final Server server, final CommandSource sender, final String co`
`26`	`26`	`final IText input = new TextInput(sender, "rules", true, ess);`
`27`	`27`	`final IText output = new KeywordReplacer(input, sender, ess);`
`28`	`28`	`final TextPager pager = new TextPager(output);`
`29`		`- pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, "rules", sender);`
	`29`	`+ pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, commandLabel, sender);`
`30`	`30`	`}`
`31`	`31`	`}`