--- a/plugins/thunderbird_labels/tb_label.js	Sat Jan 13 09:21:07 2018 -0500
+++ b/plugins/thunderbird_labels/tb_label.js	Sat Jan 13 09:37:16 2018 -0500
@@ -35,6 +35,7 @@
 {
 	if (typeof rcmail.env == 'undefined' || typeof rcmail.env.messages == 'undefined')
 		return;
+	var max_id = rcmail.env.tb_max_label;
 	var message = rcmail.env.messages[uid];
 	var rowobj = $(row.obj);
 	// add span container for little colored bullets
@@ -181,7 +182,8 @@
 
 function rcm_tb_label_create_popupmenu()
 {
-	for (i = 0; i < 7; i++)
+  var max_id = rcmail.env.tb_max_label;
+	for (i = 0; i <= max_id; i++)
 	{
 		var cur_a = $('li.label' + i +' a');
 		
@@ -197,7 +199,8 @@
 
 function rcm_tb_label_init_onclick()
 {
-	for (i = 0; i < 7; i++)
+  var max_id = rcmail.env.tb_max_label;
+	for (i = 0; i <= max_id ; i++)
 	{
 	  // find the "HTML a tags" of tb-label submenus
 		var cur_a = $('#tb_label_popup li.label' + i +' a');
@@ -213,16 +216,17 @@
 					return;
 				
 				var from = toggle_label_no;
-				var to = toggle_label_no + 1;
+				var to = toggle_label_no;
 				var unset_all = false;
 				// special case flag 0 means remove all flags
 				if (toggle_label_no == 0)
 				{
 					from = 1;
-					to = 7;
+					to = rcmail.env.tb_max_label;
+;
 					unset_all = true;
 				}
-				for (i = from; i < to; i++)
+				for (i = from; i <= to; i++)
 				{
 					toggle_label = 'label' + i;
 					toggle_label_no = i;