diff --git a/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java b/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
index e5ed79cc1cc..4c8407779b0 100644
--- a/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
+++ b/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
@@ -120,6 +120,32 @@ public class JetMacro extends BaseMacro {
                     builder.append("</a>");
                 }
             },
+            new TagType("style") {
+                @Override
+                public void appendOpenTag(StringBuilder builder, TagData tagData) {
+                    builder.append("<div style=\"");
+                    builder.append(tagData.message);
+                    builder.append("\">");
+                }
+
+                @Override
+                public void appendCloseTag(StringBuilder builder, TagData tagData) {
+                    builder.append("</div>");
+                }
+            },
+            new TagType("class") {
+                @Override
+                public void appendOpenTag(StringBuilder builder, TagData tagData) {
+                    builder.append("<div class=\"");
+                    builder.append(tagData.message);
+                    builder.append("\">");
+                }
+
+                @Override
+                public void appendCloseTag(StringBuilder builder, TagData tagData) {
+                    builder.append("</div>");
+                }
+            },
     };
     private static final Map<TagType, Pattern> openTags = new HashMap<TagType, Pattern>();
     private static final Map<TagType, Pattern> nextTokenTags = new HashMap<TagType, Pattern>();
diff --git a/confluence/src/main/resources/jet.css b/confluence/src/main/resources/jet.css
index bebac60bc3f..098c9702e00 100644
--- a/confluence/src/main/resources/jet.css
+++ b/confluence/src/main/resources/jet.css
@@ -1,5 +1,6 @@
 .jet {
   white-space: pre;
+  display: inline;
 }
 
 .jet.keyword {