diff --git a/CHANGELOG b/CHANGELOG
index 37fbce8d2..9d3cc6813 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,12 @@
 --------------------------------------------------------------------------------
 - added support for postgresql
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.10
+--------------------------------------------------------------------------------
+- merged changes from 4.3.33
+- new javascript base calendar
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.9
 --------------------------------------------------------------------------------
@@ -74,6 +80,8 @@
 - add support for fine-uploader as a replacement for the old jumploader
 - when importing from filesystem, the imported folder can be deleted afterwards
 - new calendar
+- move folder/document properly checks for access right if done by drag and
+  drop (Closes #309)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.32
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 4d0e80b4a..3a42a427a 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -251,7 +251,7 @@ switch($command) {
 			} else {
 				$mfolder = $dms->getFolder($_REQUEST['folderid']);
 				if($mfolder) {
-					if ($mfolder->getAccessMode($user) >= M_READ) {
+					if ($mfolder->getAccessMode($user) >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mfolder->setParent($folder)) {
@@ -290,7 +290,7 @@ switch($command) {
 			} else {
 				$mdocument = $dms->getDocument($_REQUEST['docid']);
 				if($mdocument) {
-					if ($mdocument->getAccessMode($user) >= M_READ) {
+					if ($mdocument->getAccessMode($user) >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mdocument->setFolder($folder)) {
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 55afd75c8..fda55e0fb 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -388,9 +388,9 @@ $(document).ready(function() {
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();
 		$this->contentStart();
-		$this->pageNavigation("", "calendar", array());
+//		$this->pageNavigation("", "calendar", array());
 ?>
-<div class="row-fluid">
+<div class="row-fluid" style="margin-bottom: 20px;">
 	<div id="calendar" class="span8" _style="display: inline-block; float: left;"></div>
 	<div id="docinfo" class="span4" _style="display: inline-block; float: right;">
 		<div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div>