Index: src/bp-core/admin/css/common-rtl.css
===================================================================
--- src/bp-core/admin/css/common-rtl.css	(revision 10796)
+++ src/bp-core/admin/css/common-rtl.css	(working copy)
@@ -374,4 +374,11 @@
 
 body.post-type-bp-email td.column-situation ul {
 	margin: 0;
-}
\ No newline at end of file
+}
+
+body.post-type-bp-email .categorydiv label {
+	display: block;
+	float: right;
+	padding-right: 25px;
+	text-indent: -25px;
+}
Index: src/bp-core/admin/css/common.css
===================================================================
--- src/bp-core/admin/css/common.css	(revision 10796)
+++ src/bp-core/admin/css/common.css	(working copy)
@@ -374,4 +374,11 @@
 
 body.post-type-bp-email td.column-situation ul {
 	margin: 0;
-}
\ No newline at end of file
+}
+
+body.post-type-bp-email .categorydiv label {
+	display: block;
+	float: left;
+	padding-left: 25px;
+	text-indent: -25px;
+}
Index: src/bp-core/classes/class-bp-walker-category-checklist.php
===================================================================
--- src/bp-core/classes/class-bp-walker-category-checklist.php	(revision 10796)
+++ src/bp-core/classes/class-bp-walker-category-checklist.php	(working copy)
@@ -84,7 +84,7 @@
 		} else {
 			/** This filter is documented in wp-includes/category-template.php */
 			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
-				'<label class="selectit"><input value="' . $category->slug . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
+				'<label for="in-'.$taxonomy.'-' . $category->term_id . '" class="selectit"><input value="' . $category->slug . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
 				checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
 				disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
 				esc_html( apply_filters( 'the_category', $category->description ) ) . '</label>';