Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rc680ce61e5a1b9f8a764b8d99f8ca701955223d8 -r22cff3dc8ce8d2e6380d0cca7bbb090a30cbd98c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c680ce61e5a1b9f8a764b8d99f8ca701955223d8)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 22cff3dc8ce8d2e6380d0cca7bbb090a30cbd98c)
@@ -476,6 +476,9 @@
 		    break;
 		}
 	    }
+
+	    request.setAttribute("oldQbQuestionUid", oldQbQuestionUid);
+	    request.setAttribute("newQbQuestionUid", qbQuestionUid);
 	}
 	request.setAttribute("qbQuestionModified", questionModificationStatus);
 
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rf7837f2892736221011a0eb6cbef1027b6692224 -r22cff3dc8ce8d2e6380d0cca7bbb090a30cbd98c
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision f7837f2892736221011a0eb6cbef1027b6692224)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 22cff3dc8ce8d2e6380d0cca7bbb090a30cbd98c)
@@ -12,7 +12,23 @@
 			qbMessage = '<fmt:message key="message.qb.modified.update" />';
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			let showMessage = true;
+		
+			// check if we are in main authoring environment
+			if (typeof window.parent.GeneralLib != 'undefined') {
+				// check if any other activities require updating
+				let activitiesWithQuestion = window.parent.GeneralLib.checkQuestionExistsInToolActivities('${oldQbQuestionUid}');
+				if (activitiesWithQuestion.length > 1) {
+					showMessage = false;
+					// update, if teacher agrees to it
+					window.parent.GeneralLib.replaceQuestionInToolActivities('${sessionMap.toolContentID}', activitiesWithQuestion, 
+																			 '${oldQbQuestionUid}','${newQbQuestionUid}');
+				}
+			}
+	
+			if (showMessage) {
+				qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			}
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
 			qbMessage = '<fmt:message key="message.qb.modified.new" />';