Use new templating style

Add two templates that I forgot to checkin last time
Switch to utf8_bin collation
Separate "Local" and "Upstream" links
Translate "Submit" button
Fix some debug statements

mailstream/database.sql

@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `mailstream_item` (
        KEY `message-id` (`message-id`),
        KEY `created` (`created`),
        KEY `completed` (`completed`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATION=utf8_bin;