diff --git a/readme.txt b/readme.txt
index 1f0515810e1..4c0d7deec64 100644
--- a/readme.txt
+++ b/readme.txt
@@ -147,6 +147,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Feature - Allow attributes to be added from the edit product page
 * Feature - Allow external products to be a part of a grouped product. Button titles will be respected when displayed.
 * Feature - Added woocommerce_get_dimension/woocommerce_get_weight helpers for normalisation. Thanks Andy Zhang
+* Tweak - Show multiple success messages/error messages if added, rather than one or the other
 * Tweak - Adding an item to an order now uses the ajax style product finder
 * Tweak - Updated chosen to latest release
 * Tweak - Changed recent order tables to make them slightly more compact
diff --git a/templates/shop/errors.php b/templates/shop/errors.php
index 47a8a88d8c8..65222bab306 100644
--- a/templates/shop/errors.php
+++ b/templates/shop/errors.php
@@ -2,10 +2,10 @@
 /**
  * Error messages
  */
-if (!$errors) return;
+if ( ! $errors ) return;
 ?>
 <ul class="woocommerce_error">
-	<?php foreach ($errors as $error) : ?>
+	<?php foreach ( $errors as $error ) : ?>
 		<li><?php echo $error; ?></li>
 	<?php endforeach; ?>
 </ul>
\ No newline at end of file
diff --git a/templates/shop/messages.php b/templates/shop/messages.php
index 9b0e6b99480..947d19f70e4 100644
--- a/templates/shop/messages.php
+++ b/templates/shop/messages.php
@@ -2,6 +2,9 @@
 /**
  * Messages
  */
-if (!$messages || !isset($messages[0])) return;
+if ( ! $messages ) return;
 ?>
-<div class="woocommerce_message"><?php echo $messages[0]; ?></div>
\ No newline at end of file
+
+<?php foreach ( $messages as $message ) : ?>
+	<div class="woocommerce_message"><?php echo $message; ?></div>
+<?php endforeach; ?>
diff --git a/woocommerce-template.php b/woocommerce-template.php
index 91c2f30760c..e1c5689b068 100644
--- a/woocommerce-template.php
+++ b/woocommerce-template.php
@@ -128,7 +128,9 @@ if (!function_exists('woocommerce_show_messages')) {
 				'errors' => $woocommerce->get_errors()
 			));
 			
-		} elseif ( $woocommerce->message_count() > 0 ) {
+		}
+		
+		if ( $woocommerce->message_count() > 0 ) {
 		
 			woocommerce_get_template('shop/messages.php', array(
 				'messages' => $woocommerce->get_messages()