diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml
--- a/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml	Fri Apr 16 14:58:25 2010 +0300
@@ -3,67 +3,61 @@
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing=""/>
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM" spacing="-0.75un"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="text_line_3" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM"/>
+    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    
+    <meshitem src="text_line_3" srcEdge="TOP" dst="text_line_2" dstEdge="BOTTOM"/>
+    <meshitem src="text_line_3" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_3" srcEdge="TOP" dst="text_line_2" dstEdge="BOTTOM" spacing="-0.75un"/>        
   </layout>
 
   <layout name="two_lines_layout" type="mesh">
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
+
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75"/>
+    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM" spacing="-0.75"/>
+    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM"/>
   </layout>
 
   <layout name="one_line_layout" type="mesh">
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-    <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
+    <meshitem src="status_icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="24.0un"/>
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_2" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75un"/>
-    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="10.0"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    <meshitem src="text_line_1" srcEdge="RIGHT" dst="text_line_2" dstEdge="LEFT"/>
+    
+    <meshitem src="text_line_2" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
   </layout>
   
 </hbwidget>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-