diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 58f0b58c9..c664497b9 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -3,7 +3,7 @@
 ### Version 2.1.4 - Sep 12, 2015
 
 **Critical Bugfixes**
-- **Build** - Fixed issue where using a packaged theme without a `site.variables` would cause build to fail
+- **Build** - Fixed issue where using a packaged theme without a `site.variables` would cause build to fail #3009 #3010
 
 **Enhancements**
 - **Form Validation** - Form validation now supports a brand new shorthand which is drastically simpler to specify #2579
@@ -28,6 +28,7 @@ $('.ui.form')
 
 **Bugfixes**
 - **Dropdown** - Fixed issue with ',' key not being allowed in dropdown due to user tagging shortcut key #3016
+- **Message** - `ui list` used inside `ui message` now aligns properly in all conditions #2958
 - **Form Validation** - Validation messages in `error message` group are now correctly removed when invalid field revalidates on blur
 - **Table** - Fixed issue where `(x) column segment table` was inheriting accidentally inheriting some grid styles
 - **Grid** - Fixed `middle aligned grid` not applying to columns #2959
diff --git a/src/definitions/collections/message.less b/src/definitions/collections/message.less
index a805d9799..83d4232e5 100755
--- a/src/definitions/collections/message.less
+++ b/src/definitions/collections/message.less
@@ -76,33 +76,33 @@
 }
 
 /* List */
-.ui.message ul.list {
+.ui.message .list:not(.ui) {
   text-align: left;
   padding: 0em;
   opacity: @listOpacity;
   list-style-position: @listStylePosition;
   margin: @listMargin 0em 0em;
 }
-.ui.message ul.list:first-child {
+.ui.message .list:not(.ui):first-child {
   margin-top: 0em;
 }
-.ui.message ul.list:last-child {
+.ui.message .list:not(.ui):last-child {
   margin-bottom: 0em;
 }
-.ui.message ul.list li {
+.ui.message .list:not(.ui) li {
   position: relative;
   list-style-type: none;
   margin: 0em 0em @listItemMargin @listItemIndent;
   padding: 0em;
 }
-.ui.message ul.list li:before {
+.ui.message .list:not(.ui) li:before {
   position: absolute;
   content: '•';
   left: -1em;
   height: 100%;
   vertical-align: baseline;
 }
-.ui.message ul.list li:last-child {
+.ui.message .list:not(.ui) li:last-child {
   margin-bottom: 0em;
 }
 
diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less
index 6cbbf9fcb..4c27db2d4 100755
--- a/src/definitions/elements/list.less
+++ b/src/definitions/elements/list.less
@@ -670,7 +670,6 @@ ol.ui.horizontal.list li:before,
   margin: 0em @horizontalOrderedCountDistance 0em 0em;
 }
 
-
 /*-------------------
        Divided
 --------------------*/