Merge https://github.com/friendica/red into zpull

mod/import.php

@@ -5,6 +5,7 @@
 
 require_once('include/Contact.php');
 require_once('include/zot.php');
+require_once('include/identity.php');
 
 function import_post(&$a) {
 

mod/message.php

@@ -9,13 +9,20 @@ require_once('include/Contact.php');
 
 function message_aside(&$a) {
 
-	$a->set_widget('newmessage',replace_macros(get_markup_template('message_side.tpl'), array(
+	$a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array(
 		'$tabs'=> array(),
+
+		'$check'=>array(
+			'label' => t('Check Mail'),
+			'url' => $a->get_baseurl(true) . '/message',
+			'sel' => (argv(1) == ''),
+		),
 		'$new'=>array(
 			'label' => t('New Message'),
 			'url' => $a->get_baseurl(true) . '/message/new',
 			'sel'=> (argv(1) == 'new'),
 		)
+
 	)));
 
 }

view/tpl/message_side.tpl

@@ -1,9 +1,5 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="message-sidebar" class="widget">
+	<div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
 	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
 	
 	<ul class="message-ul">