diff --git a/CHANGELOG b/CHANGELOG
index 7194029..e1d040f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
+Optimizations
+More secure session key generation and password storage
 Add option to make your own font small
 Separate changing nickname and password
+Use PHPs native timezones
+Add message asking for manual refresh, when it stopped working
 
 Version 1.22.1 - Nov. 13, 2016
 Performance optimizations
diff --git a/chat.php b/chat.php
index da7e9b5..50177c6 100644
--- a/chat.php
+++ b/chat.php
@@ -271,7 +271,15 @@ function print_stylesheet($init=false){
 	echo '.messages #chatters th,.messages #chatters td,.post #firstline{vertical-align:top;} ';
 	echo '.approve_waiting #action td:only-child,.help #backcredit,.login td:only-child,.alogin td:only-child,.init td:only-child{text-align:center;} .sessions td,.sessions th,.approve_waiting td,.approve_waiting th{padding: 5px;} ';
 	echo '.sessions td td{padding: 1px;} .messages #bottom_link{position:fixed;top:0.5em;right:0.5em;} .messages #top_link{position:fixed;bottom:0.5em;right:0.5em;} ';
-	echo '.post table,.controls table,.login table{border-spacing:0px;margin-left:auto;margin-right:auto;} .login table{border:2px solid;} .controls{overflow-y:none;}';
+	echo '.post table,.controls table,.login table{border-spacing:0px;margin-left:auto;margin-right:auto;} .login table{border:2px solid;} .controls{overflow-y:none;} ';
+	echo '#manualrefresh{display:block;position:fixed;text-align:center;left:25%;width:50%;animation:timeout_messages ';
+	if(isset($U['refresh'])){
+		echo $U['refresh']+10;
+	}else{
+		echo '160';
+	}
+	echo 's;z-index:2;background-color:#500000;border:2px solid #ff0000;} ';
+	echo '@keyframes timeout_messages{0%{top:-200%;} 99%{top:-200%;} 100%{top:0%;}}';
 	echo '</style>';
 	if($init){
 		return;
@@ -1444,6 +1452,7 @@ function send_messages(){
 	print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language$nocache$sort");
 	echo '<a id="top"></a>';
 	echo "<a id=\"bottom_link\" href=\"#bottom\">$I[bottom]</a>";
+	echo "<div id=\"manualrefresh\"><br>$I[manualrefresh]<br>".form('view').submit($I['reload']).'</form><br></div>';
 	if(!$U['sortupdown']){
 		echo '<div id="topic">';
 		echo get_setting('topic');
diff --git a/lang_de.php b/lang_de.php
index 146cbc1..4688f55 100644
--- a/lang_de.php
+++ b/lang_de.php
@@ -366,5 +366,6 @@ $T=[
 	'maxuploadsize' => 'Maximal hochgeladene Dateigröße in KB',
 	'maxsize' => 'Max %d KB',
 	'cssupdate' => 'Hinweis: Standard CSS ist jetzt hardcoded und kann aus der CSS Einstellung entfernt werden',
+	'manualrefresh' => 'Manuelles Neuladen erforderlich',
 ];
 ?>
diff --git a/lang_en.php b/lang_en.php
index 869e928..40a2a6e 100644
--- a/lang_en.php
+++ b/lang_en.php
@@ -366,5 +366,6 @@ $I=[
 	'maxuploadsize' => 'Maximum upload size in KB',
 	'maxsize' => 'Max %d KB',
 	'cssupdate' => 'Note: Default CSS is now hardcoded and can be removed from the CSS setting',
+	'manualrefresh' => 'Manual refresh required',
 ];
 ?>