diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index cd8d8bafbcb3ed9eb9ec144c9a6c222243963249..777e778bc07ed0654386d42e7e7e309aa2295d19 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1495,7 +1495,7 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
 	
 	item->getViewModelItem()->dirtyFilter();
 
-	// XXX stinson TODO : handle the creation date
+	// TODO RN - port creation date management to new code location
 #if 0
 	// Update the folder creation date if the child is newer than our current date
 	setCreationDate(llmax<time_t>(mCreationDate, item->getCreationDate()));
@@ -1506,7 +1506,7 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
 	requestSort();
 
 	getViewModelItem()->addChild(item->getViewModelItem());
-	// XXX stinson TODO : handle the creation date
+	// TODO RN - port creation date management to new code location
 #if 0
 	// Traverse parent folders and update creation date and resort, if necessary
 	LLFolderViewFolder* parentp = getParentFolder();
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 5e0e0973fca7ee3f60d96418f24f0307b6dd26b2..260957011e79c42fa441b76acbdf3b1e789dfb95 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -316,7 +316,7 @@ BOOL LLIMFloater::postBuild()
 	mInputEditor = getChild<LLChatEntry>("chat_editor");
 	mInputEditor->setMaxTextLength(1023);
 	// enable line history support for instant message bar
-	// XXX stinson TODO : resolve merge conflict
+	// XXX stinson TODO : resolve merge by adding autoreplace to text editors
 #if 0
 	// *TODO Establish LineEditor with autoreplace callback
 	mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));