diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
index 4f5ad61539f993bfd9a79b45899d569b957edcd4..1c255d0096bcb0ef2b735dee5555944306125b85 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
@@ -1618,6 +1618,13 @@ public class MailManagerImpl extends BasicManager implements MailManager {
 					}
 				}
 				Transport.send(msg);
+			} else if(Settings.isDebuging() && result.getReturnCode() == MailerResult.OK) {
+				try {
+					logInfo("E-mail send: " + msg.getSubject());
+					logInfo("Content    : " + msg.getContent());
+				} catch (IOException e) {
+					logError("", e);
+				}
 			} else {
 				result.setReturnCode(MailerResult.MAILHOST_UNDEFINED);
 			}
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxController.java b/src/main/java/org/olat/course/nodes/ta/DropboxController.java
index dcfa27fe956f2a1d873ae13140beffd72d2c5369..b93b8d68d132414fa597942a5b4c7e9ee2fede72 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxController.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxController.java
@@ -145,12 +145,13 @@ public class DropboxController extends BasicController {
 		myContent.contextPut("previewMode", previewMode ? Boolean.TRUE : Boolean.FALSE);
 
 		// notification
+		CourseEnvironment courseEnv = userCourseEnv.getCourseEnvironment();
+		subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(courseEnv, node);
 		if ( hasNotification && !previewMode) {
 			// offer subscription, but not to guests
-			subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(userCourseEnv, node);
 			if (subsContext != null) {
-				contextualSubscriptionCtr = AbstractTaskNotificationHandler.createContextualSubscriptionController(ureq, wControl, getDropboxPathRelToFolderRoot(
-						userCourseEnv.getCourseEnvironment(), node), subsContext, DropboxController.class);
+				String path = getDropboxPathRelToFolderRoot(courseEnv, node);
+				contextualSubscriptionCtr = AbstractTaskNotificationHandler.createContextualSubscriptionController(ureq, wControl, path, subsContext, DropboxController.class);
 				myContent.put("subscription", contextualSubscriptionCtr.getInitialComponent());
 				myContent.contextPut("hasNotification", Boolean.TRUE);
 			}
@@ -243,7 +244,7 @@ public class DropboxController extends BasicController {
 				
 				VFSLeaf fOut;
 				if (fDropbox.resolve(fIn.getName()) != null) {
-					//FIXME ms: check if dropbox quota is exceeded -> with customers abkl�ren
+					//FIXME ms: check if dropbox quota is exceeded -> clarify with customers 
 					fOut = fDropbox.createChildLeaf(getNewUniqueName(fIn.getName()));
 				} else {
 					fOut = fDropbox.createChildLeaf(fIn.getName());
@@ -308,7 +309,6 @@ public class DropboxController extends BasicController {
 						} 
 					}
 
-					subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(userCourseEnv, node);
 					// inform subscription manager about new element
 					if (subsContext != null) {
 						NotificationsManager.getInstance().markPublisherNews(subsContext, ureq.getIdentity(), true);
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxFileUploadNotificationHandler.java b/src/main/java/org/olat/course/nodes/ta/DropboxFileUploadNotificationHandler.java
index 8e86e8eaf4153653f6ee21f5a7fffc086fce8b43..75ee0375618e05a3021108711ef4eeebf2736fa6 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxFileUploadNotificationHandler.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxFileUploadNotificationHandler.java
@@ -31,7 +31,7 @@ import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
 import org.olat.course.CourseModule;
 import org.olat.course.nodes.CourseNode;
-import org.olat.course.run.userview.UserCourseEnvironment;
+import org.olat.course.run.environment.CourseEnvironment;
 
 /**
  * Description:<br>
@@ -51,8 +51,8 @@ public class DropboxFileUploadNotificationHandler extends AbstractTaskNotificati
 		//empty block
 	}
 	
-	protected static SubscriptionContext getSubscriptionContext(UserCourseEnvironment userCourseEnv, CourseNode node) {
-	  return CourseModule.createSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, node.getIdent());
+	protected static SubscriptionContext getSubscriptionContext(CourseEnvironment courseEnv, CourseNode node) {
+	  return CourseModule.createSubscriptionContext(courseEnv, node, node.getIdent());
 	}
 
 	protected String getCssClassIcon() {