An herb that is helpful for both of these types of conditions is Boswellia, common name Frankincense.  Long used in Ayurvedic medicine, this plant can work wonders with inflammation of the mucus membrane from lung to intestine and is very well worth trying out in chronic situations, instead of using ibuprofen or some other drug.  It is also indicated for both rheumatoid and osteo-arthritis; in fact, joint inflammation is currently the primary treatment use of Boswellia. Taken three times a day with a bit of food, you can see very quickly whether this herb will be useful in your given situation; it is reasonably priced and available at good health food stores.  

When you consider the very helpful actions of this herb, in combination with the fact that it does not upset the stomach or have side effects, it is a fantastic helper and addition to your medicine cabinet.  There are several different types of Boswellia, and serrata is the one you want for inflammation.  It plays nicely with other medications, as well, which is important, as some of the other types of Boswellia can increase, for example, the action of antibiotics.